- Patch from Dennis Gilmore <dennis@ausil.us> for sparc64 (#199378)

This commit is contained in:
David Cantrell 2006-07-20 20:04:17 +00:00
parent 085684a5e7
commit 6aeabf1c8a
2 changed files with 26 additions and 1 deletions

20
tk-8.4.13-cflags.patch Normal file
View File

@ -0,0 +1,20 @@
--- tk8.4.13/unix/tcl.m4.5-cflags 2006-07-20 15:59:01.000000000 -0400
+++ tk8.4.13/unix/tcl.m4 2006-07-20 16:01:36.000000000 -0400
@@ -1340,7 +1340,7 @@
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
if test "$have_dl" = yes; then
- SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
+ SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -1379,7 +1379,7 @@
SHLIB_SUFFIX=".so"
if test "$have_dl" = yes; then
- SHLIB_LD="${CC} -shared"
+ SHLIB_LD="${CC} ${CFLAGS} -shared"
DL_OBJS=""
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

View File

@ -3,7 +3,7 @@
Summary: Tk graphical toolkit for the Tcl scripting language
Name: tk
Version: %{majorver}.13
Release: 2
Release: 3%{?dist}
License: BSD
Group: Development/Languages
URL: http://tcl.sourceforge.net/
@ -19,6 +19,7 @@ Patch1: tk-8.3.5-tclm4-soname.patch
Patch2: tk-8.4.4-lib-perm.patch
Patch3: tk-8.4-no_rpath.patch
Patch4: tk-8.4.13-autoconf.patch
Patch5: tk-8.4.13-cflags.patch
%description
When paired with the Tcl scripting language, Tk provides a fast and powerful
@ -45,6 +46,7 @@ The package contains the development files and man pages for tk.
%patch2 -p1 -b .2-rolib
%patch3 -p1 -b .3-rpath
%patch4 -p1 -b .4-ac213
%patch5 -p1 -b .5-cflags
# patch1 touches tcl.m4
cd unix
@ -115,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/mann/*
%changelog
* Thu Jul 20 2006 David Cantrell <dcantrell@redhat.com> - 8.4.13-3
- Patch from Dennis Gilmore <dennis@ausil.us> for sparc64 (#199378)
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 8.4.13-2
- rebuild