robert pushed to xforms (epel7). "- prelink.patch: fix undefined symbols in (shared) lib(s)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 8 14:24:58 UTC 2015 

>From 1850efb4eba0da3345a5c49abb6fd21dfb4c6878 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon, 2 Jan 2006 21:40:01 +0000
Subject: - prelink.patch: fix undefined symbols in (shared) lib(s)


diff --git a/xforms-1.0.90-prelink.patch b/xforms-1.0.90-prelink.patch
new file mode 100644
index 0000000..ef8550a
--- /dev/null
+++ b/xforms-1.0.90-prelink.patch
@@ -0,0 +1,228 @@
+--- xforms-1.0.90/fd2ps/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
++++ xforms-1.0.90/fd2ps/Makefile.in	2006-01-02 15:18:01.000000000 -0600
+@@ -115,7 +115,7 @@
+ 
+ bin_PROGRAMS = fd2ps
+ 
+-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
++fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
+ 
+ fd2ps_SOURCES = \
+         align.c \
+--- xforms-1.0.90/fd2ps/Makefile.am.prelink	2003-11-13 15:46:47.000000000 -0600
++++ xforms-1.0.90/fd2ps/Makefile.am	2006-01-02 15:18:10.000000000 -0600
+@@ -16,7 +16,7 @@
+ 
+ bin_PROGRAMS = fd2ps
+ 
+-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
++fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
+ 
+ fd2ps_SOURCES = \
+         align.c \
+--- xforms-1.0.90/image/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
++++ xforms-1.0.90/image/Makefile.in	2006-01-02 15:05:52.000000000 -0600
+@@ -109,7 +109,7 @@
+ 
+ lib_LTLIBRARIES = libflimage.la
+ 
+-libflimage_la_LDFLAGS = -version-info 1:0:0
++libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
+ 
+ libflimage_la_SOURCES = \
+ 	flimage.h \
+--- xforms-1.0.90/image/Makefile.am.prelink	2003-11-13 15:46:48.000000000 -0600
++++ xforms-1.0.90/image/Makefile.am	2006-01-02 15:05:50.000000000 -0600
+@@ -7,7 +7,7 @@
+ 
+ lib_LTLIBRARIES = libflimage.la
+ 
+-libflimage_la_LDFLAGS = -version-info 1:0:0
++libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
+ 
+ libflimage_la_SOURCES = \
+ 	flimage.h \
+--- xforms-1.0.90/gl/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
++++ xforms-1.0.90/gl/Makefile.in	2006-01-02 15:04:24.000000000 -0600
+@@ -109,7 +109,7 @@
+ 
+ lib_LTLIBRARIES = libformsGL.la
+ 
+-libformsGL_la_LDFLAGS = -version-info 1:0:0
++libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
+ 
+ libformsGL_la_SOURCES = \
+ 	glcanvas.c \
+--- xforms-1.0.90/gl/Makefile.am.prelink	2003-11-20 03:33:11.000000000 -0600
++++ xforms-1.0.90/gl/Makefile.am	2006-01-02 15:04:20.000000000 -0600
+@@ -7,7 +7,7 @@
+ 
+ lib_LTLIBRARIES = libformsGL.la
+ 
+-libformsGL_la_LDFLAGS = -version-info 1:0:0
++libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
+ 
+ libformsGL_la_SOURCES = \
+ 	glcanvas.c \
+--- xforms-1.0.90/demos/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
++++ xforms-1.0.90/demos/Makefile.in	2006-01-02 15:07:41.000000000 -0600
+@@ -206,7 +206,7 @@
+ 
+ # Most of these demos link against libforms only. For them this default is
+ # sufficient:
+-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
++AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
+ 
+ arrowbutton_SOURCES = arrowbutton.c
+ borderwidth_SOURCES = borderwidth.c
+@@ -263,12 +263,12 @@
+ 
+ gl_SOURCES = gl.c
+ gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
+-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
+ 
+ 
+ glwin_SOURCES = glwin.c
+ glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
+-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
+ 
+ 
+ goodies_SOURCES = goodies.c
+@@ -276,7 +276,7 @@
+ 
+ ibrowser_SOURCES = ibrowser.c
+ ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ 
+@@ -284,7 +284,7 @@
+ 
+ iconvert_SOURCES = iconvert.c
+ iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ 
+@@ -295,7 +295,7 @@
+ 
+ itest_SOURCES = itest.c
+ itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ 
+@@ -304,7 +304,7 @@
+ 
+ ll_SOURCES = ll.c
+ ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ 
+@@ -355,7 +355,7 @@
+ 
+ xyplotover_SOURCES = xyplotover.c
+ xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ 
+--- xforms-1.0.90/demos/Makefile.am.prelink	2004-02-24 09:42:43.000000000 -0600
++++ xforms-1.0.90/demos/Makefile.am	2006-01-02 15:19:03.000000000 -0600
+@@ -105,7 +105,7 @@
+ 
+ # Most of these demos link against libforms only. For them this default is
+ # sufficient:
+-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
++AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
+ 
+ arrowbutton_SOURCES = arrowbutton.c
+ borderwidth_SOURCES = borderwidth.c
+@@ -168,11 +168,11 @@
+ 
+ gl_SOURCES = gl.c
+ gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
+-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
++	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
+ 
+ glwin_SOURCES = glwin.c
+ glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
+-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
++	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
+ 
+ goodies_SOURCES = goodies.c
+ group_SOURCES = group.c
+@@ -180,14 +180,14 @@
+ ibrowser_SOURCES = ibrowser.c
+ ibrowser.$(OBJEXT): fd/ibrowser_gui.c
+ ibrowser_LDADD  = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ iconify_SOURCES = iconify.c
+ 
+ iconvert_SOURCES = iconvert.c
+ iconvert_LDADD  = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ inputall_SOURCES = inputall.c
+@@ -199,7 +199,7 @@
+ itest_SOURCES = itest.c
+ itest.$(OBJEXT): fd/is_gui.c
+ itest_LDADD  = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ lalign_SOURCES = lalign.c
+@@ -207,7 +207,7 @@
+ 
+ ll_SOURCES = ll.c
+ ll_LDADD  = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ longlabel_SOURCES = longlabel.c
+@@ -260,7 +260,7 @@
+ 
+ xyplotover_SOURCES = xyplotover.c
+ xyplotover_LDADD  = ../image/libflimage.la ../lib/libforms.la \
+-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
++	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
+ 	$(X_EXTRA_LIBS)
+ 
+ yesno_SOURCES = yesno.c
+--- xforms-1.0.90/lib/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
++++ xforms-1.0.90/lib/Makefile.in	2006-01-02 14:52:11.000000000 -0600
+@@ -116,7 +116,7 @@
+ 
+ lib_LTLIBRARIES = libforms.la
+ 
+-libforms_la_LDFLAGS = -version-info 1:0:0
++libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
+ 
+ libforms_la_SOURCES = \
+ 	align.c \
+--- xforms-1.0.90/lib/Makefile.am.prelink	2003-11-20 03:33:16.000000000 -0600
++++ xforms-1.0.90/lib/Makefile.am	2006-01-02 14:52:19.000000000 -0600
+@@ -17,7 +17,7 @@
+ 
+ lib_LTLIBRARIES = libforms.la
+ 
+-libforms_la_LDFLAGS = -version-info 1:0:0
++libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
+ 
+ libforms_la_SOURCES = \
+ 	align.c \
diff --git a/xforms.spec b/xforms.spec
index 8c6b01d..432bb7e 100644
--- a/xforms.spec
+++ b/xforms.spec
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -11,6 +11,9 @@ Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
 Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# TODO: remove -lc (all), -lm (most) linker steps
+Patch1: xforms-1.0.90-prelink.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
 %if "%{?fedora}" > "4"
@@ -46,6 +49,8 @@ Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
 
 %setup -q
 
+%patch1 -p1 -b .prelink
+
 
 %build
 
@@ -53,7 +58,8 @@ Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
   --disable-static \
   --enable-optimization="$RPM_OPT_FLAGS"
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags} \
+  X_PRE_LIBS=''
 
 
 %install
@@ -88,6 +94,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog 
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
+- prelink.patch: fix undefined symbols in (shared) lib(s)
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
 - BR: libXpm-devel
 - -devel: Req: libX11-devel 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xforms.git/commit/?h=epel7&id=1850efb4eba0da3345a5c49abb6fd21dfb4c6878

More information about the scm-commits mailing list