summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cowgill <james410@cowgill.org.uk>2015-06-26 13:52:34 +0100
committerJames Cowgill <james410@cowgill.org.uk>2015-06-26 13:52:34 +0100
commitac399f83844e638b13e30e40c9da036719488f37 (patch)
treed762ba68daf9a9def9477b4bc0858c18bad03d9d
parent113c7442471c103fbdc778bdd6b7796e0b088b12 (diff)
Try again to fix the FTBFS on FreeBSD using a new patch
-rw-r--r--debian/patches/06_pkgconfig-freebsd.patch17
-rw-r--r--debian/patches/series1
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/06_pkgconfig-freebsd.patch b/debian/patches/06_pkgconfig-freebsd.patch
new file mode 100644
index 0000000..4427ee4
--- /dev/null
+++ b/debian/patches/06_pkgconfig-freebsd.patch
@@ -0,0 +1,17 @@
+Description: Install FreeBSD pkgconfig files in lib/pkgconfig again
+Author: James Cowgill <james410@cowgill.org.uk>
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,9 +190,6 @@ endif()
+
+ if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
+ set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
+- if(SFML_OS_FREEBSD)
+- set(PKGCONFIG_DIR libdata/pkgconfig)
+- endif()
+ if(BUILD_SHARED_LIBS)
+ sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
+ if(SFML_INSTALL_PKGCONFIG_FILES)
diff --git a/debian/patches/series b/debian/patches/series
index ffbf3a8..06d8ed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
02_hurd.patch
04_remove-googleapi-css.patch
05_build-doc-once.patch
+06_pkgconfig-freebsd.patch