From 22ba8bcf0e901d568556a2448efa8ebfcf698362 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sat, 17 Jan 2009 02:13:15 +0000 Subject: [PATCH] Ensure glib-1.2 builds a static library --- package/libglib12/libglib-libtool.patch | 88 ++++++++++++++++++++ package/libglib12/libglib-libtool.patch.bz2 | Bin 959 -> 0 bytes 2 files changed, 88 insertions(+) create mode 100644 package/libglib12/libglib-libtool.patch delete mode 100644 package/libglib12/libglib-libtool.patch.bz2 diff --git a/package/libglib12/libglib-libtool.patch b/package/libglib12/libglib-libtool.patch new file mode 100644 index 0000000000..5a78c69cb0 --- /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 9719c8de86be21efc0ab75a117d5095d6e0099f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>&jT4*^jL0KkKS$6(tj{pF|-+%xRUH||4e`j1T|Nr0aPy=sWjaHNuK!Hrv z7*oQJ)eIVqiVsr=G;JdUX|+8yG6RO1WMVLyU?G4_FpLuuA*M!#fM}UC5l50XiM0kz z27mwn000geX_1J+X@G_SG{P`UOoo{n8UZ3i1ksZ~0Zc?5pvmbTr=;|n4FkjytGTsb zsq^H`dD8_qwT9i0PnuyhGg%t@T0m|8U^8dv^r&qf&KB5*f<3pR;F+ipu<6;YxfyS`VZiN>}6G7 z(nzC+?EPWaoF~7BSo%qNoUA)}eO45=AOg|?Lx^jvTKlWwe1p2(k5FiLiBGguI+3RH z)4Mttvl&6$AD^@I&JcGc&)cb=Z6V_tLTf;H{5%W~ug})Q*h1II;PfvL??w>plnsX9 zdruKjssglelf1}gyw0^Cx;-!5n3t6pFCPMMu7ryNHttybNtUF$}1CxvH8Vjn40hc?Im%|B6Q37NaonUIv-ij-6Jjn!$>>Xk9 z$gj5BFjuMOYcXz3)3DdfnmOg88tuA7?S*=(qid-xTY1fK(GJM5R-oXS#2mv$6*6%W z2k?E9CIpW%DfdJfcj;nB{itp4pE@e3ErUh!IGju@0GZq8BH?jHVBJ(P^trlI4MRA@i9qFjNSoDxrz(bs*xx zP-%d~Q3Y8fjM+-Sz7T6#MahmH^fzS8@uRx6O#n};gX0|E47&`VgTIqL{pa8q0IXnP zikoevm8?QHMA>xcNfMi*gtRS|-PM}sawUDSE5_r8QlotE#g(pC%BW3i$=NebE8;0& zPQKj9WswUZxVHWI6lSW41NIQQtM}S4c&xQa1 -- 2.30.2