[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-1-1-g6948597
Stephane Glondu
steph at glondu.net
Tue Nov 1 14:59:05 UTC 2011
The following commit has been merged in the master branch:
commit 694859734cf64515214d063c786d8921eeb46941
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Nov 1 15:30:03 2011 +0100
Do not add -R$dir in X11 link options on GNU/kFreeBSD
diff --git a/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
new file mode 100644
index 0000000..9e64f26
--- /dev/null
+++ b/debian/patches/0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 1 Nov 2011 15:28:15 +0100
+Subject: Do not add -R$dir in X11 link options on GNU/kFreeBSD
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ configure | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index d6ba2e3..20b4b17 100755
+--- a/configure
++++ b/configure
+@@ -1373,6 +1373,7 @@ do
+ else
+ x11_libs="-L$dir"
+ case "$host" in
++ *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
+ *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+ *) x11_link="-L$dir -lX11";;
+ esac
+--
diff --git a/debian/patches/series b/debian/patches/series
index 92b52ed..c5cc038 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
0012-Make-objinfo-show-force_link-and-ccobjs-ccopts-when-.patch
0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
0014-Add-support-for-ENOTSUP.patch
+0015-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list