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

Bug report and patch by Russell Knighton <[email protected]> Package-Manager: portage-2.2.27
johu · Feb 18, 2016 · b2d1a05 · b2d1a05
1 parent 2ce8a6e
commit b2d1a05
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
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
@@ -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
@@ -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
@@ -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"