summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-shells/squirrelsh/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-shells/squirrelsh/files')
-rw-r--r--app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch12
-rw-r--r--app-shells/squirrelsh/files/squirrelsh-no-docs.patch25
-rw-r--r--app-shells/squirrelsh/files/squirrelsh-no-strip.patch19
-rw-r--r--app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch21
-rw-r--r--app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch140
5 files changed, 217 insertions, 0 deletions
diff --git a/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch b/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch
new file mode 100644
index 000000000000..71319c0cc7f4
--- /dev/null
+++ b/app-shells/squirrelsh/files/squirrelsh-fix-in_LDFLAGS.patch
@@ -0,0 +1,12 @@
+diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure
+--- squirrelsh-1.2.6.orig//configure 2012-03-12 21:45:25.000000000 -0400
++++ squirrelsh-1.2.6/configure 2012-03-12 21:50:36.000000000 -0400
+@@ -1138,7 +1138,7 @@
+ in_INSTALL_EXE="$installer -c -m 0755 \"\$(target)\" \"$bindir/\$(target_name)\""
+
+ if [ "$with_pcre" = "local" ] || [ "$with_squirrel" = "local" ]; then
+- in_LDFLAGS="-L\"$source_dir/lib\""
++ in_LDFLAGS="$in_LDFLAGS -L\"$source_dir/lib\""
+ fi
+
+ if [ -n "$pkgconfig" ]; then
diff --git a/app-shells/squirrelsh/files/squirrelsh-no-docs.patch b/app-shells/squirrelsh/files/squirrelsh-no-docs.patch
new file mode 100644
index 000000000000..2ed4d0160bf4
--- /dev/null
+++ b/app-shells/squirrelsh/files/squirrelsh-no-docs.patch
@@ -0,0 +1,25 @@
+diff -Naur squirrelsh-1.2.6.orig//Makefile.in squirrelsh-1.2.6/Makefile.in
+--- squirrelsh-1.2.6.orig//Makefile.in 2011-12-16 13:25:08.000000000 -0500
++++ squirrelsh-1.2.6/Makefile.in 2012-03-12 21:58:50.000000000 -0400
+@@ -19,14 +19,6 @@
+ @MAKE_PCRE@
+ @MAKE_SQUIRREL@
+ @MAKE_SHELL@
+- @INSTALL@ -d -m 0755 "@DOCDIR@"
+- @INSTALL@ -c -m 0644 COPYING "@DOCDIR@"
+- @INSTALL@ -c -m 0644 COPYING-squirrel "@DOCDIR@"
+- @INSTALL@ -c -m 0644 COPYING-zlib "@DOCDIR@"
+- @INSTALL@ -c -m 0644 HISTORY "@DOCDIR@"
+- @INSTALL@ -c -m 0644 README "@DOCDIR@"
+- @INSTALL@ -c -m 0644 doc/squirrel3.pdf "@DOCDIR@"
+- @INSTALL@ -c -m 0644 doc/squirrelsh.pdf "@DOCDIR@"
+ @INSTALL@ -d -m 0755 "@MANDIR@"
+ @INSTALL@ -c -m 0644 doc/squirrelsh.1 "@MANDIR@"
+ @INSTALL_MIME@
+@@ -35,6 +27,5 @@
+ @MAKE_PCRE@
+ @MAKE_SQUIRREL@
+ @MAKE_SHELL@
+- @RMDIR@ "@DOCDIR@"
+ @RM@ "@MANDIR@/squirrelsh.1"
+ @UNINSTALL_MIME@
diff --git a/app-shells/squirrelsh/files/squirrelsh-no-strip.patch b/app-shells/squirrelsh/files/squirrelsh-no-strip.patch
new file mode 100644
index 000000000000..cf0286c5c562
--- /dev/null
+++ b/app-shells/squirrelsh/files/squirrelsh-no-strip.patch
@@ -0,0 +1,19 @@
+diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure
+--- squirrelsh-1.2.6.orig//configure 2012-03-12 20:19:01.000000000 -0400
++++ squirrelsh-1.2.6/configure 2012-03-12 20:32:25.000000000 -0400
+@@ -1163,7 +1163,6 @@
+ [ -z "$CFLAGS" ] && in_CFLAGS="$in_CFLAGS -fomit-frame-pointer"
+ [ -z "$CXXFLAGS" ] && in_CXXFLAGS="$in_CXXFLAGS -fomit-frame-pointer"
+ in_DEFINES="-DNDEBUG"
+- [ -z "$LDFLAGS" ] && in_LDFLAGS="$in_LDFLAGS -s"
+ fi
+
+ if [ "$with_pcre" = "local" ] && [ "$with_libraries" = "static" ]; then
+@@ -1233,7 +1232,6 @@
+ in_CXXFLAGS_LIB="$in_CXXFLAGS -fPIC"
+ in_MAKE_LIB="$linker -shared $in_LDFLAGS -o \"\$(target)\" \$(objects)"
+ in_INSTALL_LIB="$installer -c -m 0755 \"\$(target)\" \"$libdir\""
+- [ "$with_strip" ] && in_INSTALL_LIB="$in_INSTALL_LIB \\&\\& strip --strip-unneeded \"$libdir/\$(target_name)\""
+ in_UNINSTALL_LIB="rm -f \"$libdir/\$(target_name)\""
+ fi
+
diff --git a/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch b/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch
new file mode 100644
index 000000000000..d9a5f0b34fe1
--- /dev/null
+++ b/app-shells/squirrelsh/files/squirrelsh-remove-forced-abi.patch
@@ -0,0 +1,21 @@
+diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure
+--- squirrelsh-1.2.6.orig//configure 2012-03-12 22:02:40.000000000 -0400
++++ squirrelsh-1.2.6/configure 2012-03-12 22:05:42.000000000 -0400
+@@ -1172,15 +1172,10 @@
+ # ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS (machine-dependent)
+ case "$target" in
+ x86)
+- in_CFLAGS="-m32 $in_CFLAGS"
+- in_CXXFLAGS="-m32 $in_CXXFLAGS"
+- in_LDFLAGS="-m32 $in_LDFLAGS";;
++ :;;
+
+ x86_64)
+- in_CFLAGS="-m64 $in_CFLAGS"
+- in_CXXFLAGS="-m64 $in_CXXFLAGS"
+- in_DEFINES="$in_DEFINES -D_SQ64"
+- in_LDFLAGS="-m64 $in_LDFLAGS";;
++ in_DEFINES="$in_DEFINES -D_SQ64";;
+
+ ia64)
+ in_DEFINES="$in_DEFINES -D_SQ64";;
diff --git a/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch b/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch
new file mode 100644
index 000000000000..0c36d7548623
--- /dev/null
+++ b/app-shells/squirrelsh/files/squirrelsh-rename-LDFLAGS.patch
@@ -0,0 +1,140 @@
+diff -Naur squirrelsh-1.2.6.orig//configure squirrelsh-1.2.6/configure
+--- squirrelsh-1.2.6.orig//configure 2010-11-09 13:16:43.000000000 -0500
++++ squirrelsh-1.2.6/configure 2012-03-12 20:19:01.000000000 -0400
+@@ -55,8 +55,8 @@
+ with_ranlib="yes" # yes, no
+ linker="$cpp_compiler"
+
+-if [ -n "$LFLAGS" ]; then
+- linker_flags="$LFLAGS"
++if [ -n "$LDFLAGS" ]; then
++ linker_flags="$LDFLAGS"
+ else
+ linker_flags="-Wl,-O1 -Wl,--as-needed"
+ fi
+@@ -136,7 +136,7 @@
+ CFLAGS C compiler options
+ CXX C++ compiler
+ CXXFLAGS C++ compiler options
+- LFLAGS Linker options
++ LDFLAGS Linker options
+ __SHEOF__
+ closescript
+ }
+@@ -275,7 +275,7 @@
+ return 1
+ }
+
+-# getoutput CPPFLAGS LFLAGS
++# getoutput CPPFLAGS LDFLAGS
+ # Compile C++ code and run the compiled program
+ getoutput ()
+ {
+@@ -824,7 +824,7 @@
+ checkforlinkeroption || msg_fail
+
+ # Check for optional linker options
+-if [ -z "$LFLAGS" ]; then
++if [ -z "$LDFLAGS" ]; then
+ checkforlinkeroption "-pipe" || msg_result "no"
+ checkforlinkeroption "-flto" y || msg_result "no"
+ fi
+@@ -1131,27 +1131,27 @@
+ #------ CREATE MAKEFILES --------------------------------------------------------------------------
+
+ # Define variables for substitution
+-# ... CFLAGS, CXXFLAGS, DEFINES, LFLAGS, INSTALL_EXE (machine-independent)
++# ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS, INSTALL_EXE (machine-independent)
+ in_CFLAGS="-c $c_compiler_flags"
+ in_CXXFLAGS="-c $cpp_compiler_flags"
+-in_LFLAGS="$linker_flags"
++in_LDFLAGS="$linker_flags"
+ in_INSTALL_EXE="$installer -c -m 0755 \"\$(target)\" \"$bindir/\$(target_name)\""
+
+ if [ "$with_pcre" = "local" ] || [ "$with_squirrel" = "local" ]; then
+- in_LFLAGS="-L\"$source_dir/lib\""
++ in_LDFLAGS="-L\"$source_dir/lib\""
+ fi
+
+ if [ -n "$pkgconfig" ]; then
+ if [ "$with_pcre" = "system" ]; then
+ in_CFLAGS="$in_CFLAGS `$pkgconfig --cflags-only-other libpcre`"
+ in_CXXFLAGS="$in_CXXFLAGS `$pkgconfig --cflags-only-other libpcre`"
+- in_LFLAGS="$in_LFLAGS `$pkgconfig --libs-only-other --libs-only-L libpcre`"
++ in_LDFLAGS="$in_LDFLAGS `$pkgconfig --libs-only-other --libs-only-L libpcre`"
+ fi
+
+ if [ "$with_squirrel" = "system" ]; then
+ in_CFLAGS="$in_CFLAGS `$pkgconfig --cflags-only-other libsquirrel`"
+ in_CXXFLAGS="$in_CXXFLAGS `$pkgconfig --cflags-only-other libsquirrel`"
+- in_LFLAGS="$in_LFLAGS `$pkgconfig --libs-only-other --libs-only-L libsquirrel`"
++ in_LDFLAGS="$in_LDFLAGS `$pkgconfig --libs-only-other --libs-only-L libsquirrel`"
+ fi
+ fi
+
+@@ -1163,25 +1163,25 @@
+ [ -z "$CFLAGS" ] && in_CFLAGS="$in_CFLAGS -fomit-frame-pointer"
+ [ -z "$CXXFLAGS" ] && in_CXXFLAGS="$in_CXXFLAGS -fomit-frame-pointer"
+ in_DEFINES="-DNDEBUG"
+- [ -z "$LFLAGS" ] && in_LFLAGS="$in_LFLAGS -s"
++ [ -z "$LDFLAGS" ] && in_LDFLAGS="$in_LDFLAGS -s"
+ fi
+
+ if [ "$with_pcre" = "local" ] && [ "$with_libraries" = "static" ]; then
+ in_DEFINES="$in_DEFINES -DPCRE_STATIC"
+ fi
+
+-# ... CFLAGS, CXXFLAGS, DEFINES, LFLAGS (machine-dependent)
++# ... CFLAGS, CXXFLAGS, DEFINES, LDFLAGS (machine-dependent)
+ case "$target" in
+ x86)
+ in_CFLAGS="-m32 $in_CFLAGS"
+ in_CXXFLAGS="-m32 $in_CXXFLAGS"
+- in_LFLAGS="-m32 $in_LFLAGS";;
++ in_LDFLAGS="-m32 $in_LDFLAGS";;
+
+ x86_64)
+ in_CFLAGS="-m64 $in_CFLAGS"
+ in_CXXFLAGS="-m64 $in_CXXFLAGS"
+ in_DEFINES="$in_DEFINES -D_SQ64"
+- in_LFLAGS="-m64 $in_LFLAGS";;
++ in_LDFLAGS="-m64 $in_LDFLAGS";;
+
+ ia64)
+ in_DEFINES="$in_DEFINES -D_SQ64";;
+@@ -1223,7 +1223,7 @@
+
+ # Work around Apple's linker behavior ("-L../lib" linker option seems to be ignored)
+ if [ "$platform" = "macosx" ]; then
+- #in_LFLAGS="$in_LFLAGS -search_paths_first"
++ #in_LDFLAGS="$in_LDFLAGS -search_paths_first"
+ [ "$with_pcre" = "local" ] && in_LIBS=`echo "$in_LIBS" | $sed -e "s@-lpcre@../lib/libpcre$lib_suffix@"`
+ [ "$with_squirrel" = "local" ] && in_LIBS=`echo "$in_LIBS" | $sed -e "s@-lsquirrel@../lib/libsquirrel$lib_suffix@"`
+ fi
+@@ -1231,7 +1231,7 @@
+ in_LIB_EXT="$dll_suffix"
+ in_CFLAGS_LIB="$in_CFLAGS -fPIC"
+ in_CXXFLAGS_LIB="$in_CXXFLAGS -fPIC"
+- in_MAKE_LIB="$linker -shared $in_LFLAGS -o \"\$(target)\" \$(objects)"
++ in_MAKE_LIB="$linker -shared $in_LDFLAGS -o \"\$(target)\" \$(objects)"
+ in_INSTALL_LIB="$installer -c -m 0755 \"\$(target)\" \"$libdir\""
+ [ "$with_strip" ] && in_INSTALL_LIB="$in_INSTALL_LIB \\&\\& strip --strip-unneeded \"$libdir/\$(target_name)\""
+ in_UNINSTALL_LIB="rm -f \"$libdir/\$(target_name)\""
+@@ -1274,7 +1274,7 @@
+ s#@LINK@#$linker#
+ s#@EXE_EXT@#$exe_suffix#
+ s#@LIB_EXT@#$in_LIB_EXT#
+-s#@MAKE_EXE@#$linker $in_LFLAGS -o "\$(target)" \$(objects) $in_LIBS#
++s#@MAKE_EXE@#$linker $in_LDFLAGS -o "\$(target)" \$(objects) $in_LIBS#
+ s#@MAKE_LIB@#$in_MAKE_LIB#
+ s#@MAKE_PCRE@#$in_MAKE_PCRE#
+ s#@MAKE_SHELL@#@cd shell \&\& \$(MAKE) \$@#
+@@ -1285,7 +1285,7 @@
+ s#@CXXFLAGS_EXE@#$in_CXXFLAGS_EXE#
+ s#@CFLAGS_LIB@#$in_CFLAGS_LIB#
+ s#@CXXFLAGS_LIB@#$in_CXXFLAGS_LIB#
+-s#@LFLAGS@#$in_LFLAGS#
++s#@LDFLAGS@#$in_LDFLAGS#
+ s#@DEFINES@#$in_DEFINES#
+ s#@INCLUDES@#$in_INCLUDES#
+ s#@LIBS@#$in_LIBS#