/[gentoo-x86]/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch
Gentoo

Contents of /app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Mar 13 11:39:20 2012 UTC (2 years, 3 months ago) by blueness
Branch: MAIN
CVS Tags: HEAD
Version bump

(Portage version: 2.1.10.44/cvs/Linux x86_64)

1 diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure
2 --- squirrelsh-1.2.6.orig//configure 2010-11-09 13:16:43.000000000 -0500
3 +++ squirrelsh-1.2.6/configure 2012-03-12 20:19:01.000000000 -0400
4 @@ -55,8 +55,8 @@
5 with_ranlib="yes" # yes, no
6 linker="$cpp_compiler"
7
8 -if [ -n "$LFLAGS" ]; then
9 - linker_flags="$LFLAGS"
10 +if [ -n "$LDFLAGS" ]; then
11 + linker_flags="$LDFLAGS"
12 else
13 linker_flags="-Wl,-O1 -Wl,--as-needed"
14 fi
15 @@ -136,7 +136,7 @@
16 CFLAGS C compiler options
17 CXX C++ compiler
18 CXXFLAGS C++ compiler options
19 - LFLAGS Linker options
20 + LDFLAGS Linker options
21 __SHEOF__
22 closescript
23 }
24 @@ -275,7 +275,7 @@
25 return 1
26 }
27
28 -# getoutput CPPFLAGS LFLAGS
29 +# getoutput CPPFLAGS LDFLAGS
30 # Compile C++ code and run the compiled program
31 getoutput ()
32 {
33 @@ -824,7 +824,7 @@
34 checkforlinkeroption || msg_fail
35
36 # Check for optional linker options
37 -if [ -z "$LFLAGS" ]; then
38 +if [ -z "$LDFLAGS" ]; then
39 checkforlinkeroption "-pipe" || msg_result "no"
40 checkforlinkeroption "-flto" y || msg_result "no"
41 fi
42 @@ -1131,27 +1131,27 @@
43 #------ CREATE MAKEFILES --------------------------------------------------------------------------
44
45 # Define variables for substitution
46 -# ... CFLAGS, CXXFLAGS, DEFINES, LFLAGS, INSTALL_EXE (machine-independent)
47 +# ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS, INSTALL_EXE (machine-independent)
48 in_CFLAGS="-c $c_compiler_flags"
49 in_CXXFLAGS="-c $cpp_compiler_flags"
50 -in_LFLAGS="$linker_flags"
51 +in_LDFLAGS="$linker_flags"
52 in_INSTALL_EXE="$installer -c -m 0755 \"\$(target)\" \"$bindir/\$(target_name)\""
53
54 if [ "$with_pcre" = "local" ] || [ "$with_squirrel" = "local" ]; then
55 - in_LFLAGS="-L\"$source_dir/lib\""
56 + in_LDFLAGS="-L\"$source_dir/lib\""
57 fi
58
59 if [ -n "$pkgconfig" ]; then
60 if [ "$with_pcre" = "system" ]; then
61 in_CFLAGS="$in_CFLAGS `$pkgconfig --cflags-only-other libpcre`"
62 in_CXXFLAGS="$in_CXXFLAGS `$pkgconfig --cflags-only-other libpcre`"
63 - in_LFLAGS="$in_LFLAGS `$pkgconfig --libs-only-other --libs-only-L libpcre`"
64 + in_LDFLAGS="$in_LDFLAGS `$pkgconfig --libs-only-other --libs-only-L libpcre`"
65 fi
66
67 if [ "$with_squirrel" = "system" ]; then
68 in_CFLAGS="$in_CFLAGS `$pkgconfig --cflags-only-other libsquirrel`"
69 in_CXXFLAGS="$in_CXXFLAGS `$pkgconfig --cflags-only-other libsquirrel`"
70 - in_LFLAGS="$in_LFLAGS `$pkgconfig --libs-only-other --libs-only-L libsquirrel`"
71 + in_LDFLAGS="$in_LDFLAGS `$pkgconfig --libs-only-other --libs-only-L libsquirrel`"
72 fi
73 fi
74
75 @@ -1163,25 +1163,25 @@
76 [ -z "$CFLAGS" ] && in_CFLAGS="$in_CFLAGS -fomit-frame-pointer"
77 [ -z "$CXXFLAGS" ] && in_CXXFLAGS="$in_CXXFLAGS -fomit-frame-pointer"
78 in_DEFINES="-DNDEBUG"
79 - [ -z "$LFLAGS" ] && in_LFLAGS="$in_LFLAGS -s"
80 + [ -z "$LDFLAGS" ] && in_LDFLAGS="$in_LDFLAGS -s"
81 fi
82
83 if [ "$with_pcre" = "local" ] && [ "$with_libraries" = "static" ]; then
84 in_DEFINES="$in_DEFINES -DPCRE_STATIC"
85 fi
86
87 -# ... CFLAGS, CXXFLAGS, DEFINES, LFLAGS (machine-dependent)
88 +# ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS (machine-dependent)
89 case "$target" in
90 x86)
91 in_CFLAGS="-m32 $in_CFLAGS"
92 in_CXXFLAGS="-m32 $in_CXXFLAGS"
93 - in_LFLAGS="-m32 $in_LFLAGS";;
94 + in_LDFLAGS="-m32 $in_LDFLAGS";;
95
96 x86_64)
97 in_CFLAGS="-m64 $in_CFLAGS"
98 in_CXXFLAGS="-m64 $in_CXXFLAGS"
99 in_DEFINES="$in_DEFINES -D_SQ64"
100 - in_LFLAGS="-m64 $in_LFLAGS";;
101 + in_LDFLAGS="-m64 $in_LDFLAGS";;
102
103 ia64)
104 in_DEFINES="$in_DEFINES -D_SQ64";;
105 @@ -1223,7 +1223,7 @@
106
107 # Work around Apple's linker behavior ("-L../lib" linker option seems to be ignored)
108 if [ "$platform" = "macosx" ]; then
109 - #in_LFLAGS="$in_LFLAGS -search_paths_first"
110 + #in_LDFLAGS="$in_LDFLAGS -search_paths_first"
111 [ "$with_pcre" = "local" ] && in_LIBS=`echo "$in_LIBS" | $sed -e "s@-lpcre@../lib/libpcre$lib_suffix@"`
112 [ "$with_squirrel" = "local" ] && in_LIBS=`echo "$in_LIBS" | $sed -e "s@-lsquirrel@../lib/libsquirrel$lib_suffix@"`
113 fi
114 @@ -1231,7 +1231,7 @@
115 in_LIB_EXT="$dll_suffix"
116 in_CFLAGS_LIB="$in_CFLAGS -fPIC"
117 in_CXXFLAGS_LIB="$in_CXXFLAGS -fPIC"
118 - in_MAKE_LIB="$linker -shared $in_LFLAGS -o \"\$(target)\" \$(objects)"
119 + in_MAKE_LIB="$linker -shared $in_LDFLAGS -o \"\$(target)\" \$(objects)"
120 in_INSTALL_LIB="$installer -c -m 0755 \"\$(target)\" \"$libdir\""
121 [ "$with_strip" ] && in_INSTALL_LIB="$in_INSTALL_LIB \\&\\& strip --strip-unneeded \"$libdir/\$(target_name)\""
122 in_UNINSTALL_LIB="rm -f \"$libdir/\$(target_name)\""
123 @@ -1274,7 +1274,7 @@
124 s#@LINK@#$linker#
125 s#@EXE_EXT@#$exe_suffix#
126 s#@LIB_EXT@#$in_LIB_EXT#
127 -s#@MAKE_EXE@#$linker $in_LFLAGS -o "\$(target)" \$(objects) $in_LIBS#
128 +s#@MAKE_EXE@#$linker $in_LDFLAGS -o "\$(target)" \$(objects) $in_LIBS#
129 s#@MAKE_LIB@#$in_MAKE_LIB#
130 s#@MAKE_PCRE@#$in_MAKE_PCRE#
131 s#@MAKE_SHELL@#@cd shell \&\& \$(MAKE) \$@#
132 @@ -1285,7 +1285,7 @@
133 s#@CXXFLAGS_EXE@#$in_CXXFLAGS_EXE#
134 s#@CFLAGS_LIB@#$in_CFLAGS_LIB#
135 s#@CXXFLAGS_LIB@#$in_CXXFLAGS_LIB#
136 -s#@LFLAGS@#$in_LFLAGS#
137 +s#@LDFLAGS@#$in_LDFLAGS#
138 s#@DEFINES@#$in_DEFINES#
139 s#@INCLUDES@#$in_INCLUDES#
140 s#@LIBS@#$in_LIBS#

  ViewVC Help
Powered by ViewVC 1.1.20