[patch] 1.3.5-gentoo.patch

1.3.5-gentoo.patch (text/plain), 3.26 KB, created by Goran Sterjov on 2009-05-22 11:40:16 UTC

diff -ruN poco-1.3.5-all.orig/Data/ODBC/Makefile poco-1.3.5-all/Data/ODBC/Makefile
--- poco-1.3.5-all.orig/Data/ODBC/Makefile	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/ODBC/Makefile	2009-05-22 20:34:48.000000000 +1000
@@ -24,19 +24,19 @@
 # CYGWIN platform has its own ODBC library in /lib/w32api 
 SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
 else
-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
+ifeq (unixodbc, $(GENTOO_ODBC))
 SYSLIBS += -lodbc -lodbcinst
 COMMONFLAGS += -DPOCO_UNIXODBC
 else
-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
+ifeq (unixodbc, $(GENTOO_ODBC))
 SYSLIBS += -lodbc -lodbcinst
 COMMONFLAGS += -DPOCO_UNIXODBC
 else
-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
+ifeq (unixodbc, $(GENTOO_ODBC))
 SYSLIBS += -liodbc -liodbcinst
 COMMONFLAGS += -DPOCO_IODBC
 else
-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
+ifeq (unixodbc, $(GENTOO_ODBC))
 SYSLIBS += -liodbc -liodbcinst
 COMMONFLAGS += -DPOCO_IODBC
 else
diff -ruN poco-1.3.5-all.orig/Makefile poco-1.3.5-all/Makefile
--- poco-1.3.5-all.orig/Makefile	2009-05-13 04:22:15.000000000 +1000
+++ poco-1.3.5-all/Makefile	2009-05-22 21:09:09.000000000 +1000
@@ -21,7 +21,7 @@
 
 .PHONY: all libexecs cppunit tests samples clean distclean install
 
-all: libexecs tests samples
+all: libexecs
 
 INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
 COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip
@@ -31,7 +31,7 @@
 
 install: libexecs
 	mkdir -p $(INSTALLDIR)/include/Poco
-	mkdir -p $(INSTALLDIR)/lib
+	mkdir -p $(INSTALLDIR)/$(LIBDIR)
 	mkdir -p $(INSTALLDIR)/bin
 	for comp in $(COMPONENTS) ; do \
 		if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
@@ -41,11 +41,11 @@
 			find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
 		fi ; \
 	done
-	find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
-	find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
+	find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
+	find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
 
-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
-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
+libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec
+tests    =  Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
 samples  =  Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples
 
 .PHONY: $(libexecs)
diff -ruN poco-1.3.5-all.orig/components poco-1.3.5-all/components
--- poco-1.3.5-all.orig/components	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/components	2009-05-22 20:39:13.000000000 +1000
@@ -1,12 +1,6 @@
-CppUnit
 Foundation
 XML
 Util
 Net
-Crypto
-NetSSL_OpenSSL
 Data
-Data/SQLite
-Data/ODBC
-Data/MySQL
 Zip