Bug#267499: gnome-libs: patch for bug #267499
Aurelien Jarno
Aurelien Jarno <aurel32@debian.org>, 267499@bugs.debian.org
Tue, 14 Jun 2005 12:24:53 +0200
This is a multi-part MIME message sent by reportbug.
--===============0342638941==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: gnome-libs
Followup-For: Bug #267499
And the patch...
--===============0342638941==
Content-Type: text/x-c; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="gnome-libs_kfreesbd.patch"
diff -u gnome-libs-1.4.2/debian/patches/01_configure.dpatch gnome-libs-1.4.2/debian/patches/01_configure.dpatch
--- gnome-libs-1.4.2/debian/patches/01_configure.dpatch
+++ gnome-libs-1.4.2/debian/patches/01_configure.dpatch
@@ -15,6 +15,15 @@
--- configure.orig 2003-04-26 21:25:05.000000000 +0200
+++ configure 2003-04-26 21:26:55.000000000 +0200
+@@ -1926,7 +1926,7 @@
+ esac
+ ;;
+
+-freebsd*)
++freebsd* | kfreebsd*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
@@ -1976,7 +1976,7 @@
# This must be Linux ELF.
linux-gnu*)
@@ -24,7 +33,35 @@
lt_cv_deplibs_check_method=pass_all ;;
*)
# glibc up to 2.1.1 does not perform some relocations on ARM
-@@ -10765,14 +10765,14 @@
+@@ -3614,7 +3614,7 @@
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd*)
++ freebsd* | kfreebsd*-gnu)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+@@ -4013,6 +4013,18 @@
+ dynamic_linker=no
+ ;;
+
++kfreebsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++ soname_spec='${libname}${release}.so$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='GNU ld.so'
++ ;;
++
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+@@ -10765,14 +10777,14 @@
fi
@@ -42,7 +79,7 @@
cat > conftest.$ac_ext <<EOF
#line 10778 "configure"
#include "confdefs.h"
-@@ -10860,14 +10860,14 @@
+@@ -10860,14 +10872,14 @@
png_ok=no
fi
rm -f conftest*
@@ -60,7 +97,7 @@
cat > conftest.$ac_ext <<EOF
#line 10873 "configure"
#include "confdefs.h"
-@@ -10903,7 +10903,7 @@
+@@ -10903,7 +10915,7 @@
echo "$ac_t""$png_ok" 1>&6
if test "$png_ok" = yes; then
@@ -69,7 +106,7 @@
#define HAVE_LIBPNG 1
EOF
-@@ -11540,27 +11540,27 @@
+@@ -11540,27 +11552,27 @@
fi
else
@@ -105,7 +142,7 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -11575,11 +11575,11 @@
+@@ -11575,11 +11587,11 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -119,7 +156,7 @@
ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -11587,7 +11587,7 @@
+@@ -11587,7 +11599,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldb1 $LIBS"
cat > conftest.$ac_ext <<EOF
@@ -128,7 +165,7 @@
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
-@@ -11598,7 +11598,7 @@
+@@ -11598,7 +11610,7 @@
dbopen()
; return 0; }
EOF
@@ -137,7 +174,7 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -11616,27 +11616,27 @@
+@@ -11616,27 +11628,27 @@
DB_LIB="-ldb1"
else
echo "$ac_t""no" 1>&6
@@ -173,7 +210,7 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -11651,11 +11651,11 @@
+@@ -11651,11 +11663,11 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -187,7 +224,7 @@
ac_lib_var=`echo db-4'_'__db185_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
-@@ -11663,7 +11663,7 @@
+@@ -11663,7 +11675,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldb-4 $LIBS"
cat > conftest.$ac_ext <<EOF
@@ -196,7 +233,7 @@
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
-@@ -11674,7 +11674,7 @@
+@@ -11674,7 +11686,7 @@
__db185_open()
; return 0; }
EOF
@@ -205,7 +242,7 @@
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
-@@ -11715,17 +11715,17 @@
+@@ -11715,17 +11727,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -226,7 +263,7 @@
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -11763,17 +11763,17 @@
+@@ -11763,17 +11775,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -249,0 +287,39 @@
+--- libart_lgpl/configure.orig 2005-06-14 01:11:38.000000000 +0200
++++ libart_lgpl/configure 2005-06-14 01:15:29.000000000 +0200
+@@ -1677,7 +1677,7 @@
+ esac
+ ;;
+
+-freebsd*)
++freebsd* | kfreebsd*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+@@ -3365,7 +3365,7 @@
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd*)
++ freebsd* | kfreebsd*-gnu)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+@@ -3764,6 +3764,18 @@
+ dynamic_linker=no
+ ;;
+
++kfreebsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++ soname_spec='${libname}${release}.so$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='GNU ld.so'
++ ;;
++
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
--===============0342638941==--