| 1 |
tommy 14/12/29 13:13:01 |
| 2 |
|
| 3 |
Added: 1.4.6_p4-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump, bug 508720 |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x35899067) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/poco/files/1.4.6_p4-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/poco/files/1.4.6_p4-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/poco/files/1.4.6_p4-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.4.6_p4-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- components 2012-11-18 16:56:59.000000000 +0100 |
| 18 |
+++ components 2012-12-06 12:29:07.779546771 +0100 |
| 19 |
@@ -1,14 +1,8 @@ |
| 20 |
-CppUnit |
| 21 |
Foundation |
| 22 |
XML |
| 23 |
Util |
| 24 |
Net |
| 25 |
-Crypto |
| 26 |
-NetSSL_OpenSSL |
| 27 |
Data |
| 28 |
-Data/SQLite |
| 29 |
-Data/ODBC |
| 30 |
-Data/MySQL |
| 31 |
Zip |
| 32 |
PageCompiler |
| 33 |
PageCompiler/File2Page |
| 34 |
--- Data/ODBC/ODBC.make 2014-04-18 13:41:55.000000000 +0200 |
| 35 |
+++ Data/ODBC/ODBC.make.new 2014-12-29 13:44:03.000000000 +0100 |
| 36 |
@@ -14,9 +14,9 @@ |
| 37 |
ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?)) |
| 38 |
ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu |
| 39 |
else ifeq (0, $(shell test -d /usr/lib64; echo $$?)) |
| 40 |
-ODBCLIBDIR = /usr/lib64 |
| 41 |
+ODBCLIBDIR = /usr/$(LIBDIR) |
| 42 |
else |
| 43 |
-ODBCLIBDIR = /usr/lib |
| 44 |
+ODBCLIBDIR = /usr/$(LIBDIR) |
| 45 |
endif |
| 46 |
endif |
| 47 |
|
| 48 |
@@ -35,10 +35,10 @@ |
| 49 |
# -DODBCVER=0x0300: SQLHandle declaration issue |
| 50 |
# -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++ |
| 51 |
CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX |
| 52 |
-else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) |
| 53 |
+else ifeq (unixodbc, $(GENTOO_ODBC) |
| 54 |
SYSLIBS += -lodbc |
| 55 |
COMMONFLAGS += -DPOCO_UNIXODBC |
| 56 |
-else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) |
| 57 |
+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 58 |
SYSLIBS += -liodbc -liodbcinst |
| 59 |
COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc |
| 60 |
else |
| 61 |
--- Makefile 2012-11-18 16:57:00.000000000 +0100 |
| 62 |
+++ Makefile 2012-12-06 12:29:07.779546771 +0100 |
| 63 |
@@ -33,7 +33,7 @@ |
| 64 |
|
| 65 |
install: libexecs |
| 66 |
mkdir -p $(INSTALLDIR)/include/Poco |
| 67 |
- mkdir -p $(INSTALLDIR)/lib |
| 68 |
+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 69 |
mkdir -p $(INSTALLDIR)/bin |
| 70 |
for comp in $(COMPONENTS) ; do \ |
| 71 |
if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 72 |
@@ -43,11 +43,11 @@ |
| 73 |
find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 74 |
fi ; \ |
| 75 |
done |
| 76 |
- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 77 |
- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 78 |
+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 79 |
+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 80 |
|
| 81 |
-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 |
| 82 |
-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 |
| 83 |
+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec |
| 84 |
+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 85 |
samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples |
| 86 |
|
| 87 |
.PHONY: $(libexecs) |
Archives