1 diff -Nur poco-1.4.5-all_old/components poco-1.4.5-all/components
2 --- poco-1.4.5-all_old/components 2012-11-18 16:56:59.000000000 +0100
3 +++ poco-1.4.5-all/components 2012-12-06 12:29:07.779546771 +0100
18 PageCompiler/File2Page
19 diff -Nur poco-1.4.5-all_old/Data/ODBC/ODBC.make poco-1.4.5-all/Data/ODBC/ODBC.make
20 --- poco-1.4.5-all_old/Data/ODBC/ODBC.make 2012-11-18 16:56:57.000000000 +0100
21 +++ poco-1.4.5-all/Data/ODBC/ODBC.make 2012-12-06 12:29:07.779546771 +0100
23 ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
24 ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu
25 else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
26 -ODBCLIBDIR = /usr/lib64
27 +ODBCLIBDIR = /usr/$(LIBDIR)
29 -ODBCLIBDIR = /usr/lib
30 +ODBCLIBDIR = /usr/$(LIBDIR)
35 CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
36 # CYGWIN platform has its own ODBC library in /lib/w32api
37 SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
38 -else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?))
39 +else ifeq (unixodbc, $(GENTOO_ODBC))
40 SYSLIBS += -lodbc -lodbcinst
41 COMMONFLAGS += -DPOCO_UNIXODBC
42 -else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?))
43 +else ifeq (unixodbc, $(GENTOO_ODBC))
44 SYSLIBS += -liodbc -liodbcinst
45 COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
47 diff -Nur poco-1.4.5-all_old/Makefile poco-1.4.5-all/Makefile
48 --- poco-1.4.5-all_old/Makefile 2012-11-18 16:57:00.000000000 +0100
49 +++ poco-1.4.5-all/Makefile 2012-12-06 12:29:07.779546771 +0100
53 mkdir -p $(INSTALLDIR)/include/Poco
54 - mkdir -p $(INSTALLDIR)/lib
55 + mkdir -p $(INSTALLDIR)/$(LIBDIR)
56 mkdir -p $(INSTALLDIR)/bin
57 for comp in $(COMPONENTS) ; do \
58 if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
60 find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
63 - find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
64 - find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
65 + find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
66 + find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
68 -libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec
69 -tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests
70 +libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
71 +tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
72 samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples