[SCM] Minimal buy-in FITS library and utility package branch, debian, updated. 42181c62779c523b0135d680ae334a25a89c69bb

Ole Streicher debian at liska.ath.cx
Mon Feb 27 13:17:18 UTC 2012


The following commit has been merged in the debian branch:
commit a0c20fc6497a8213389c7e795017d63878098f0b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Feb 27 14:14:19 2012 +0100

    Add Patch to build on HURD and GNU/kFreeBSD

diff --git a/debian/patches/build_bsd+hurd.patch b/debian/patches/build_bsd+hurd.patch
new file mode 100644
index 0000000..5d88a4c
--- /dev/null
+++ b/debian/patches/build_bsd+hurd.patch
@@ -0,0 +1,31 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Extend the mklib script so that it (hopefully) builds shared
+ libraries on GNU/kFreeBSD and Hurd
+--- a/mklib
++++ b/mklib
+@@ -113,7 +113,7 @@ fi
+ #
+ case $ARCH in
+ 
+-    'Linux' | 'OpenBSD')
++    'Linux' | 'OpenBSD' | 'GNU' | GNU/*)
+ 	# GCC-based environment
+ 
+ 	if [ $NOPREFIX = 1 ] ; then
+@@ -144,11 +144,13 @@ case $ARCH in
+             FINAL_LIBS=${LIBNAME}.a
+         else
+ 	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
+-	    if [ $ARCH = 'Linux' ] ; then
++	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
+ 		OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
+-	    else
++	    ;;
++	    *)
+ 		OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
+-	    fi
++	    ;;
++            esac
+ 	    if [ x${PATCH} = "x" ] ; then
+ 		VERSION="${MAJOR}.${MINOR}"
+ 	    else
diff --git a/debian/patches/series b/debian/patches/series
index aeb5ea6..e710981 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_autoheader.patch
 link_to_so.patch
 use_shared_libwcstools.patch
 build_tclfun.patch
+build_bsd+hurd.patch

-- 
Minimal buy-in FITS library and utility package



More information about the debian-science-commits mailing list