rpms/glib/devel glib-1.2.10-no_undefined.patch, NONE, 1.1 glib.spec, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12838

Modified Files:
	glib.spec 
Added Files:
	glib-1.2.10-no_undefined.patch 
Log Message:
* Thu May 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-21
- fix undefined symbols in libgmodule,libgthread


glib-1.2.10-no_undefined.patch:

--- NEW FILE glib-1.2.10-no_undefined.patch ---
--- glib-1.2.10/gthread/Makefile.am.no_undefined	1999-08-26 08:09:43.000000000 -0500
+++ glib-1.2.10/gthread/Makefile.am	2006-05-04 08:38:36.000000000 -0500
@@ -17,9 +17,11 @@
 libgthread_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-release $(LT_RELEASE) \
+	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgthread_la_LIBADD = @G_THREAD_LIBS@
+libgthread_la_DEPENDENCIES = $(libglib) $(top_builddir)/gmodule/libgmodule.la
+libgthread_la_LIBADD = @G_THREAD_LIBS@ $(libglib) $(top_builddir)/gmodule/libgmodule.la
 
 noinst_PROGRAMS = testgthread
-testgthread_LDADD = ../libglib.la libgthread.la 
+testgthread_LDADD = libgthread.la 
--- glib-1.2.10/gmodule/Makefile.am.no_undefined	2001-03-15 09:33:10.000000000 -0600
+++ glib-1.2.10/gmodule/Makefile.am	2006-05-04 08:33:22.000000000 -0500
@@ -27,23 +27,25 @@
 	@G_MODULE_LDFLAGS@ \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-release $(LT_RELEASE) \
+	-no-undefined -Wl,--no-undefined \
 	-export-dynamic
 
-libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+libgmodule_la_DEPENDENCIES = $(libglib)
+libgmodule_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
 # we should really depend on $(libglib) for libgmodule.la, but libtool has a
 # problem with this ;(
 
 libgplugin_a_la_SOURCES = libgplugin_a.c
 libgplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
-libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+libgplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
 
 libgplugin_b_la_SOURCES = libgplugin_b.c
 libgplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module
-libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
+libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libglib)
 
 noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
-testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
+testgmodule_LDADD = libgmodule.la @G_MODULE_LIBS@
 
 .PHONY: files release
 


Index: glib.spec
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/glib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glib.spec	24 Apr 2006 14:37:42 -0000	1.1
+++ glib.spec	4 May 2006 14:32:56 -0000	1.2
@@ -3,7 +3,7 @@
 Name: 	 glib
 Epoch:	 1
 Version: 1.2.10
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 License: LGPL
 Group:	 System Environment/Libraries
@@ -11,10 +11,14 @@
 Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: automake14 autoconf213
+BuildRequires: libtool
+
 # Suppress warnings about varargs macros for -pedantic
 Patch1: glib-1.2.10-isowarning.patch
 Patch2: glib-1.2.10-gcc34.patch
 Patch3: glib-1.2.10-underquoted.patch
+Patch4: glib-1.2.10-no_undefined.patch
 
 %description
 GLib is a handy library of utility functions. This C library is
@@ -36,28 +40,43 @@
 %patch1 -p1 -b .isowarning
 %patch2 -p1 -b .gcc34
 %patch3 -p1 -b .underquoted
+%patch4 -p1 -b .no_undefined
+
+#libtoolize --copy --force
+automake-1.4
+aclocal-1.4
+autoconf-2.13
+autoheader-2.13
 
 
 %build
+LIBTOOL=/usr/bin/libtool \
 %configure --disable-static
 
-make %{?_smp_mflags}
-
-
-# I *know* ||: isn't needed, but this *is* a legacy pkg afterall.
-%check || :
-make check
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+#makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
+
+# libgmodule-1.2.so.0* missing eXecute bit
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 
+## Unpackaged files
+# info
 rm -rf $RPM_BUILD_ROOT%{_infodir}
+# .la fies... die die die.
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-# libgmodule-1.2.so.0* missing eXecute bit
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so
+# despite use of --disable-static, delete static libs that get built anyway
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+
+
+# I *know* ||: isn't needed, but this could end up used by legacy
+%check ||:
+make check LIBTOOL=/usr/bin/libtool
 
 
 %clean
@@ -86,6 +105,9 @@
 
 
 %changelog
+* Thu May 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-21
+- fix undefined symbols in libgmodule,libgthread
+
 * Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-20
 - cleanup %%description
 - libgmodule-1.2.so.0* missing eXecute bit