Change some files and spec.
This commit is contained in:
parent
a97387a825
commit
d8ab80e57a
@ -1,20 +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 @@
|
||||
--- tk8.5a5/unix/tcl.m4.5-cflags 2006-12-19 15:09:26.000000000 +0100
|
||||
+++ tk8.5a5/unix/tcl.m4 2006-12-19 15:14:17.000000000 +0100
|
||||
@@ -1398,7 +1398,7 @@
|
||||
# get rid of the warnings.
|
||||
#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_LD='${CC} -shared -Wl,-soname,${@}'
|
||||
+ SHLIB_LD='${CC} ${CFLAGS} -shared -Wl,-soname,${@}'
|
||||
DL_OBJS="tclLoadDl.o"
|
||||
DL_LIBS="-ldl"
|
||||
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
||||
@@ -1428,7 +1428,7 @@
|
||||
SHLIB_LD_LIBS='${LIBS}'
|
||||
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"
|
||||
- SHLIB_LD="${CC} -shared"
|
||||
+ SHLIB_LD="${CC} ${CFLAGS} -shared"
|
||||
DL_OBJS=""
|
||||
DL_LIBS="-ldl"
|
||||
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
|
||||
|
6
tk.spec
6
tk.spec
@ -15,11 +15,11 @@ BuildRequires: tcl-devel = %{version}, autoconf
|
||||
BuildRequires: libX11-devel, sed
|
||||
# panedwindow.n from itcl conflicts
|
||||
Obsoletes: itcl <= 3.2
|
||||
Patch1: tk-8.3.5-tclm4-soname.patch
|
||||
Patch1: tk-8.5a5-tclm4-soname.patch
|
||||
Patch2: tk-8.5a5-lib-perm.patch
|
||||
Patch3: tk-8.4-no_rpath.patch
|
||||
Patch3: tk-8.5a5-no_rpath.patch
|
||||
Patch4: tk-8.4.13-autoconf.patch
|
||||
Patch5: tk-8.4.13-cflags.patch
|
||||
Patch5: tk-8.5a5-cflags.patch
|
||||
|
||||
%description
|
||||
When paired with the Tcl scripting language, Tk provides a fast and powerful
|
||||
|
Loading…
Reference in New Issue
Block a user