From 3a012c116c540cc83f0369b41cb90be7a6b09471 Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 18 Jan 2016 20:46:52 +0000 Subject: Drop outdated patch. Fix cwrappers build. Use consistent rpath flags. --- devel/poco/distinfo | 8 ++-- devel/poco/patches/patch-ae | 8 ++-- devel/poco/patches/patch-ai | 62 ------------------------- devel/poco/patches/patch-build_config_Linux | 6 +-- devel/poco/patches/patch-build_config_SunOS-GCC | 6 +-- 5 files changed, 14 insertions(+), 76 deletions(-) delete mode 100644 devel/poco/patches/patch-ai (limited to 'devel/poco') diff --git a/devel/poco/distinfo b/devel/poco/distinfo index 062bc955b04..aac2b11c5c5 100644 --- a/devel/poco/distinfo +++ b/devel/poco/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2016/01/16 12:15:12 ryoon Exp $ +$NetBSD: distinfo,v 1.12 2016/01/18 20:46:52 joerg Exp $ SHA1 (poco-1.6.1-all.tar.gz) = 38841212a6893d4290909a62b4f310450230fb6d RMD160 (poco-1.6.1-all.tar.gz) = a7ab9429db5b4b5fc02c194a208f11f296deb90b @@ -15,9 +15,9 @@ SHA1 (patch-aa) = be1c72c9c63b65e8d4211abab9dd036255ed6233 SHA1 (patch-ab) = a5ebcc44e9ab728d9812cefd01188622bfea172f SHA1 (patch-ac) = 08fa398b76935082dccbfb81bb69877d10996f6f SHA1 (patch-ad) = f6eeb9dc9b3a85525f264edbd1587bc4f124b9e1 -SHA1 (patch-ae) = a13a01901b3df6df7d5e5ad7a0639086b0897566 +SHA1 (patch-ae) = d168bd1e391992b64555373065fb431ad9c23731 SHA1 (patch-ag) = e1ef2677c25d445cdae97c832211e2407fae9af3 SHA1 (patch-ah) = a4ba890ab2501552bf18b2778f3f3593e4b0abcb -SHA1 (patch-build_config_Linux) = 39a42f82fcac9415208af28a05ab2faf0558667b -SHA1 (patch-build_config_SunOS-GCC) = e8e6cc78e4f099c32c75561f554c3faeef7f6828 +SHA1 (patch-build_config_Linux) = f1b4eb600a472dfe9dca8d61e9c6ac3c5e4f2f9d +SHA1 (patch-build_config_SunOS-GCC) = ea20ef2a7b03914d0e8ae3b3d804bfd87750d1e9 SHA1 (patch-build_rules_compile) = 9db52d6c83c3e26ea421d960af2b8a1fb412201f diff --git a/devel/poco/patches/patch-ae b/devel/poco/patches/patch-ae index 02712b2acff..ac511da6fb8 100644 --- a/devel/poco/patches/patch-ae +++ b/devel/poco/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ +$NetBSD: patch-ae,v 1.2 2016/01/18 20:46:52 joerg Exp $ # clean up the FreeBSD configuration to fit better with pkgsrc @@ -12,9 +12,9 @@ $NetBSD: patch-ae,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ LIB = ar -cr RANLIB = ranlib -SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ -+SHLIBFLAGS = -L$(POCO_PREFIX)/lib -Wl,-R$(POCO_PREFIX)/lib \ ++SHLIBFLAGS = -L$(POCO_PREFIX)/lib -Wl,-rpath,$(POCO_PREFIX)/lib \ + $(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p)) -+SHLIB = $(CXX) -Wl,-R$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@ ++SHLIB = $(CXX) -Wl,-rpath,$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln DEP = $(POCO_BASE)/build/script/makedepend.gcc STRIP = strip @@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ SHAREDOPT_CC = -fPIC SHAREDOPT_CXX = -fPIC -SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) -+SHAREDOPT_LINK = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(LIBPATH) ++SHAREDOPT_LINK = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(POCO_PREFIX)/lib -L$(LIBPATH) DEBUGOPT_CC = -g -D_DEBUG DEBUGOPT_CXX = -g -D_DEBUG DEBUGOPT_LINK = -g diff --git a/devel/poco/patches/patch-ai b/devel/poco/patches/patch-ai deleted file mode 100644 index eb417543991..00000000000 --- a/devel/poco/patches/patch-ai +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ - -# simplify the search for ODBC components, since we control where they -# are in pkgsrc -# -# someday, make it able to use either unixodbc or iodbc - ---- Data/ODBC/Makefile.orig 2010-12-16 05:43:32.000000000 +0000 -+++ Data/ODBC/Makefile -@@ -9,44 +9,18 @@ - include $(POCO_BASE)/build/rules/global - - # adjust for the target system (usually '/usr/lib' or '/usr/local/lib') --ODBCLIBDIR = /usr/lib -+ODBCLIBDIR = @ODBCLIBDIR@ - --INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc --SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib -+INCLUDE += -I@ODBCINCDIR@ -+SYSLIBS += -L@ODBCLIBDIR@ - --ifeq ($(POCO_CONFIG),MinGW) --# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib --else --ifeq ($(POCO_CONFIG),CYGWIN) --# -DODBCVER=0x0300: SQLHandle declaration issue --# -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++ --CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX --# 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 $$?)) --SYSLIBS += -lodbc -lodbcinst -+# with unixodbc - COMMONFLAGS += -DPOCO_UNIXODBC --else --ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?)) - SYSLIBS += -lodbc -lodbcinst --COMMONFLAGS += -DPOCO_UNIXODBC --else --ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) --SYSLIBS += -liodbc -liodbcinst --COMMONFLAGS += -DPOCO_IODBC --else --ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) --SYSLIBS += -liodbc -liodbcinst --COMMONFLAGS += -DPOCO_IODBC --else --$(error No ODBC library found. Please install unixODBC or iODBC and try again) --endif --endif --endif --endif --endif --endif -+ -+# with iodbc -+# SYSLIBS += -liodbc -liodbcinst -+# COMMONFLAGS += -DPOCO_IODBC - - objects = Binder ConnectionHandle Connector DataTypes EnvironmentHandle \ - Extractor ODBCColumn ODBCException ODBCStatementImpl \ diff --git a/devel/poco/patches/patch-build_config_Linux b/devel/poco/patches/patch-build_config_Linux index f369c8b2258..0b1decfef99 100644 --- a/devel/poco/patches/patch-build_config_Linux +++ b/devel/poco/patches/patch-build_config_Linux @@ -1,4 +1,4 @@ -$NetBSD: patch-build_config_Linux,v 1.2 2016/01/16 12:15:12 ryoon Exp $ +$NetBSD: patch-build_config_Linux,v 1.3 2016/01/18 20:46:52 joerg Exp $ # Build a full set of shared library search paths, rather than # *assuming* everything is under PREFIX. @@ -9,7 +9,7 @@ $NetBSD: patch-build_config_Linux,v 1.2 2016/01/16 12:15:12 ryoon Exp $ LIB = ${CROSS_COMPILE}ar -cr RANLIB = ${CROSS_COMPILE}ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ -+SHLIBFLAGS = $(LDFLAGS) -Wl,-R$(POCO_PREFIX)/lib \ ++SHLIBFLAGS = $(LDFLAGS) -Wl,-rpath,$(POCO_PREFIX)/lib -L$(POCO_PREFIX)/lib \ + $(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p)) SHLIBLN = $(POCO_BASE)/build/script/shlibln STRIP = ${CROSS_COMPILE}strip @@ -28,7 +28,7 @@ $NetBSD: patch-build_config_Linux,v 1.2 2016/01/16 12:15:12 ryoon Exp $ SHAREDOPT_CC = -fPIC SHAREDOPT_CXX = -fPIC -SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) -+SHAREDOPT_LINK = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(LIBPATH) ++SHAREDOPT_LINK = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(POCO_PREFIX)/lib -L -L$(LIBPATH) DEBUGOPT_CC = -g -D_DEBUG DEBUGOPT_CXX = -g -D_DEBUG DEBUGOPT_LINK = -g diff --git a/devel/poco/patches/patch-build_config_SunOS-GCC b/devel/poco/patches/patch-build_config_SunOS-GCC index 52d21022233..06ca9246a4f 100644 --- a/devel/poco/patches/patch-build_config_SunOS-GCC +++ b/devel/poco/patches/patch-build_config_SunOS-GCC @@ -1,4 +1,4 @@ -$NetBSD: patch-build_config_SunOS-GCC,v 1.4 2016/01/16 12:15:12 ryoon Exp $ +$NetBSD: patch-build_config_SunOS-GCC,v 1.5 2016/01/18 20:46:52 joerg Exp $ Resolve a conflict on SunOS, where GCC>=4.6 will force C99 with C++ and require _XOPEN_SOURCE=600, whereas GCC<4.6 will reject C99 with C++. @@ -8,7 +8,7 @@ and require _XOPEN_SOURCE=600, whereas GCC<4.6 will reject C99 with C++. LIB = ar -cr RANLIB = ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ -+SHLIBFLAGS = $(LDFLAGS) -Wl,-R$(POCO_PREFIX)/lib \ ++SHLIBFLAGS = $(LDFLAGS) -Wl,-rpath,$(POCO_PREFIX)/lib -L$(POCO_PREFIX)/lib \ + $(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p)) SHLIBLN = $(POCO_BASE)/build/script/shlibln STRIP = strip @@ -31,7 +31,7 @@ and require _XOPEN_SOURCE=600, whereas GCC<4.6 will reject C99 with C++. SHAREDOPT_CC = -fPIC SHAREDOPT_CXX = -fPIC -SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) -+SHAREDOPT_LINK = -Wl,-R$(POCO_PREFIX)/lib -L$(LIBPATH) ++SHAREDOPT_LINK = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(POCO_PREFIX)/lib -L$(LIBPATH) DEBUGOPT_CC = -g -D_DEBUG DEBUGOPT_CXX = -g -D_DEBUG DEBUGOPT_LINK = -g -- cgit v1.2.3