Ensure glib-1.2 builds a static library

2 files changed, 88 insertions, 0 deletions

diff --git a/package/libglib12/libglib-libtool.patch b/package/libglib12/libglib-libtool.patch
new file mode 100644
index 000000000..5a78c69cb
--- /dev/null
+++ b/package/libglib12/libglib-libtool.patch
@@ -0,0 +1,88 @@
+--- glib/ltconfig
++++ glib/ltconfig
+@@ -450,6 +450,7 @@
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case "$host_os" in
+ linux-gnu*) ;;
++linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1981,6 +1982,28 @@
+   fi
+   ;;
+ 
++linux-uclibc*)
++  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'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # deplibs_check_method=pass_all
++  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /lib/libuClibc-*.so`
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  # Note: copied from linux-gnu, and may not be appropriate.
++  hardcode_into_libs=yes
++  # Assume using the uClibc dynamic linker.
++  dynamic_linker="uClibc ld.so"
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+--- g/configure
++++ g/configure
+@@ -966,6 +966,7 @@
+ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo "$ac_t""$host" 1>&6
++host_alias=$host
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+ echo "configure:972: checking build system type" >&5
+diff -urN glib-1.2.10-0rig/ltconfig glib-1.2.10/ltconfig
+--- glib-1.2.10-0rig/ltconfig	2009-01-17 02:56:10.000000000 +0100
++++ glib-1.2.10/ltconfig	2009-01-17 02:55:40.000000000 +0100
+@@ -448,6 +448,9 @@
+ fi
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++echo $ac_n "host_os... $host_os" 1>&5
++echo $ac_n "host_os... $host_os" 1>&6
++
+ case "$host_os" in
+ linux-gnu*) ;;
+ linux-uclibc*) ;;
+@@ -761,6 +764,7 @@
+     ;;
+   *)
+     can_build_shared=no
++    echo "$progname:764: No OS found: host_os = $host_os" >&5
+     ;;
+   esac
+ fi
+@@ -1791,6 +1795,8 @@
+ # If you have `file' or equivalent on your system and you're not sure
+ # whether `pass_all' will *always* work, you probably want this one.
+ echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
++echo $ac_n "host_os... $host_os" 1>&5
++echo $ac_n "host_os... $host_os" 1>&6
+ case "$host_os" in
+ aix3*)
+   version_type=linux
+@@ -1982,7 +1988,7 @@
+   fi
+   ;;
+ 
+-linux-uclibc*)
++*-linux | linux-uclibc*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
diff --git a/package/libglib12/libglib-libtool.patch.bz2 b/package/libglib12/libglib-libtool.patch.bz2
deleted file mode 100644
index 9719c8de8..000000000
--- a/package/libglib12/libglib-libtool.patch.bz2
+++ /dev/null