fltk-config transmits wrong ldflags (#1112930)
This commit is contained in:
Rex Dieter
parent
7f6fe10f9c
commit
bf4cb55be8
@ -1,12 +0,0 @@
|
||||
diff -up fltk-1.1.9/fltk-config.in.ldstaticflags fltk-1.1.9/fltk-config.in
|
||||
--- fltk-1.1.9/fltk-config.in.ldstaticflags 2008-02-20 12:10:13.000000000 -0600
|
||||
+++ fltk-1.1.9/fltk-config.in 2009-05-13 10:23:15.071926233 -0500
|
||||
@@ -216,7 +216,7 @@ else
|
||||
includes=
|
||||
fi
|
||||
|
||||
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
||||
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
||||
libs=-L$libdir
|
||||
else
|
||||
libs=
|
||||
@ -1,37 +0,0 @@
|
||||
This patch fixes https://bugzilla.redhat.com/show_bug.cgi?id=708185.
|
||||
|
||||
When linking against dynamic libraries, we don't need to pass all
|
||||
required libraries (-lGL, -lpng, -lXinerama etc). Such libraries are only needed
|
||||
when performing static linking.
|
||||
|
||||
diff -up fltk-1.3.0rc5/fltk-config.in.fltk_config fltk-1.3.0rc5/fltk-config.in
|
||||
--- fltk-1.3.0rc5/fltk-config.in.fltk_config 2011-01-01 01:10:38.000000000 +0100
|
||||
+++ fltk-1.3.0rc5/fltk-config.in 2011-05-27 13:48:10.203763843 +0200
|
||||
@@ -240,23 +240,23 @@ fi
|
||||
|
||||
# Calculate needed libraries
|
||||
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
||||
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
||||
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
||||
|
||||
if test x$use_forms = xyes; then
|
||||
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
||||
fi
|
||||
if test x$use_gl = xyes; then
|
||||
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
||||
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
||||
fi
|
||||
if test x$use_images = xyes; then
|
||||
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
||||
+ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
if test x$use_cairo = xyes; then
|
||||
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
||||
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
95
fltk-1.3.2-fltk_config.patch
Normal file
95
fltk-1.3.2-fltk_config.patch
Normal file
@ -0,0 +1,95 @@
|
||||
diff -up fltk-1.3.2/fltk-config.cmake.in.fltk_config fltk-1.3.2/fltk-config.cmake.in
|
||||
--- fltk-1.3.2/fltk-config.cmake.in.fltk_config 2011-07-18 23:49:30.000000000 -0500
|
||||
+++ fltk-1.3.2/fltk-config.cmake.in 2014-06-25 07:37:23.149452668 -0500
|
||||
@@ -223,7 +223,7 @@ else
|
||||
includes=
|
||||
fi
|
||||
|
||||
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
||||
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
||||
libs=-L$libdir
|
||||
else
|
||||
libs=
|
||||
@@ -231,28 +231,28 @@ fi
|
||||
|
||||
# Calculate needed libraries
|
||||
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
||||
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
||||
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
||||
|
||||
if test x$use_forms = xyes; then
|
||||
- LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
||||
+ LDLIBS="-lfltk_forms$SHAREDSUFFIX"
|
||||
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
||||
fi
|
||||
if test x$use_gl = xyes; then
|
||||
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
||||
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX"
|
||||
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
||||
fi
|
||||
if test x$use_images = xyes; then
|
||||
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
||||
+ LDLIBS="-lfltk_images$SHAREDSUFFIX"
|
||||
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
if test x$use_cairo = xyes; then
|
||||
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
||||
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX"
|
||||
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
||||
-LDSTATIC="$LDFLAGS $LDSTATIC"
|
||||
+LDLIBS="$libs $LDLIBS"
|
||||
+#LDSTATIC="$LDFLAGS $LDSTATIC"
|
||||
|
||||
# Answer to user requests
|
||||
if test -n "$echo_help"; then
|
||||
diff -up fltk-1.3.2/fltk-config.in.fltk_config fltk-1.3.2/fltk-config.in
|
||||
--- fltk-1.3.2/fltk-config.in.fltk_config 2011-07-18 23:49:30.000000000 -0500
|
||||
+++ fltk-1.3.2/fltk-config.in 2014-06-25 07:37:05.886296078 -0500
|
||||
@@ -223,7 +223,7 @@ else
|
||||
includes=
|
||||
fi
|
||||
|
||||
-if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
|
||||
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
|
||||
libs=-L$libdir
|
||||
else
|
||||
libs=
|
||||
@@ -231,28 +231,28 @@ fi
|
||||
|
||||
# Calculate needed libraries
|
||||
LDSTATIC="$libdir/libfltk.a $LDLIBS"
|
||||
-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
|
||||
+LDLIBS="-lfltk$SHAREDSUFFIX"
|
||||
|
||||
if test x$use_forms = xyes; then
|
||||
LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
|
||||
fi
|
||||
if test x$use_gl = xyes; then
|
||||
- LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
|
||||
+ LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
|
||||
fi
|
||||
if test x$use_images = xyes; then
|
||||
- LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
|
||||
+ LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
if test x$use_cairo = xyes; then
|
||||
- LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
|
||||
+ LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
|
||||
LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
|
||||
fi
|
||||
|
||||
-LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
|
||||
-LDSTATIC="$LDFLAGS $LDSTATIC"
|
||||
+LDLIBS="$libs $LDLIBS"
|
||||
+#LDSTATIC="$LDFLAGS $LDSTATIC"
|
||||
|
||||
# Answer to user requests
|
||||
if test -n "$echo_help"; then
|
||||
10
fltk.spec
10
fltk.spec
@ -9,7 +9,7 @@
|
||||
Summary: C++ user interface toolkit
|
||||
Name: fltk
|
||||
Version: 1.3.2
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
|
||||
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
|
||||
License: LGPLv2+ with exceptions
|
||||
@ -25,11 +25,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Source1: fltk-config.sh
|
||||
|
||||
## FIXME/TODO: upstream these asap -- Rex
|
||||
Patch1: fltk-1.1.9-fltk_config.patch
|
||||
# add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930)
|
||||
Patch1: fltk-1.3.2-fltk_config.patch
|
||||
# libfltk_gl.so had undefined symbols
|
||||
Patch3: fltk-1.1.x-r5750-undefined.patch
|
||||
Patch5: fltk-1.1.8-fluid_desktop.patch
|
||||
Patch8: fltk-1.3.0-rh708185.patch
|
||||
|
||||
# http://www.fltk.org/str.php?L2599
|
||||
Patch9: fltk-1_v4.3.x-keyboard-x11.patch
|
||||
@ -107,7 +107,6 @@ Requires: %{name}-devel
|
||||
%patch1 -p1 -b .fltk_config
|
||||
%patch3 -p1 -b .undefined
|
||||
%patch5 -p1 -b .fluid_desktop
|
||||
%patch8 -p1 -b .rh708185
|
||||
%patch9 -p1 -b .deadkeys
|
||||
%patch10 -p1 -b .clipboard
|
||||
%patch11 -p1 -b .clipboard-x11
|
||||
@ -230,6 +229,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jun 25 2014 Rex Dieter <rdieter@fedoraproject.org> 1.3.2-6
|
||||
- fltk-config transmits wrong ldflags (#1112930)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user