summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2016-02-18 10:59:00 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2016-02-18 10:59:12 +0100
commitb2d1a0549d2ecba00dbbb58f8c4242137a8a0773 (patch)
tree7d1a5121706c5e2dbf4a735a4a94da14a3cf5ba7 /gnustep-libs
parentapp-admin/supervisor: Bump (diff)
downloadgentoo-b2d1a0549d2ecba00dbbb58f8c4242137a8a0773.tar.gz
gentoo-b2d1a0549d2ecba00dbbb58f8c4242137a8a0773.tar.bz2
gentoo-b2d1a0549d2ecba00dbbb58f8c4242137a8a0773.zip
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
Diffstat (limited to 'gnustep-libs')
-rw-r--r--gnustep-libs/sope/files/sope-2.3.2-mysql-preamble.patch35
-rw-r--r--gnustep-libs/sope/sope-2.3.2.ebuild1
-rw-r--r--gnustep-libs/sope/sope-3.0.1.ebuild4
3 files changed, 40 insertions, 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
new file mode 100644
index 00000000000..86bcc7ac351
--- /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 5706ac2c132..f042ec925ea 100644
--- 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 06fd5e2bfbf..f7140008044 100644
--- 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"