gnustep-libs/sope: fix mysql compilation, bug #566138

Bug report and patch by Russell Knighton <russell@annunaki2k2.co.uk>

Package-Manager: portage-2.2.27

diff --git a/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch b/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch
new file mode 100644 (file)
index 0000000..86bcc7a
--- /dev/null
+++ b/gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch
@@ -0,0 +1,35 @@
+--- a/sope-gdl1/MySQL/GNUmakefile.preamble     2015-09-07 17:52:21.244429620 +0100
++++ b/sope-gdl1/MySQL/GNUmakefile.preamble     2015-09-07 17:54:16.586770809 +0100
+@@ -33,12 +33,12 @@
+ 
+ MySQL_BUNDLE_LIBS += \
+       -lGDLAccess     \
+-      `mysql_config --libs`
++      $(shell mysql_config --libs)
+ 
+ MySQLD_BUNDLE_LIBS += \
+       -lGDLAccess     \
+       -lEOControl     \
+-      `mysql_config --libs`
++      $(shell mysql_config --libs)
+ 
+ gdltest_TOOL_LIBS += \
+       -lGDLAccess     \
+@@ -46,14 +46,15 @@
+ 
+ # set compile flags and go
+ 
+-ADDITIONAL_CFLAGS += `mysql_config --cflags`
++ADDITIONAL_CFLAGS += $(shell mysql_config --cflags)
+ 
+ ADDITIONAL_INCLUDE_DIRS += \
+       -I../GDLAccess -I.. -I$(SOPE_ROOT)
+ 
+ ADDITIONAL_INCLUDE_DIRS += \
+       -I$(SOPE_ROOT)/sope-core/               \
+-      -I$(SOPE_ROOT)/sope-core/NGExtensions
++      -I$(SOPE_ROOT)/sope-core/NGExtensions   \
++      $(shell mysql_config --cflags)
+ 
+ 
+ # dependencies

diff --git a/gnustep-libs/sope/sope-2.3.2.ebuild b/gnustep-libs/sope/sope-2.3.2.ebuild
index 5706ac2c132c7858e47363e4be988d1e4463aeb5..f042ec925ea2663991649cece8e8736535f3cc12 100644 (file)
--- a/gnustep-libs/sope/sope-2.3.2.ebuild
+++ b/gnustep-libs/sope/sope-2.3.2.ebuild
@@ -39,6 +39,7 @@ pkg_pretend() {
 src_prepare() {
        # https://github.com/inverse-inc/sope/pull/33
        epatch "${FILESDIR}"/${P}-optional-deps.patch
+       epatch "${FILESDIR}"/${P}-mysql-preamble.patch
        gnustep-base_src_prepare
 }
 

diff --git a/gnustep-libs/sope/sope-3.0.1.ebuild b/gnustep-libs/sope/sope-3.0.1.ebuild
index 06fd5e2bfbfd91562d41cf6c39ce57cccde82f72..f7140008044ce438fd66dceea5a9d81e3973d38a 100644 (file)
--- a/gnustep-libs/sope/sope-3.0.1.ebuild
+++ b/gnustep-libs/sope/sope-3.0.1.ebuild
@@ -29,6 +29,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.3.2-mysql-preamble.patch
+)
+
 pkg_pretend() {
        if use ssl && use gnutls && use libressl ; then
                ewarn "You have enabled both gnutls and libressl, but only"