Drop old patches
This commit is contained in:
Orion Poplawski
parent
c146c589df
commit
c1d8aeaac9
@ -1,265 +0,0 @@
|
|||||||
diff -urN octave-3.6.4/build-aux/config.guess octave-3.6.4-aarch64/build-aux/config.guess
|
|
||||||
--- octave-3.6.4/build-aux/config.guess 2013-02-21 14:19:21.000000000 -0600
|
|
||||||
+++ octave-3.6.4-aarch64/build-aux/config.guess 2013-03-03 06:51:19.308542539 -0600
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
||||||
# 2011, 2012 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
-timestamp='2012-01-01'
|
|
||||||
+timestamp='2012-09-25'
|
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
|
||||||
# under the terms of the GNU General Public License as published by
|
|
||||||
@@ -17,9 +17,7 @@
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
-# along with this program; if not, write to the Free Software
|
|
||||||
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
||||||
-# 02110-1301, USA.
|
|
||||||
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
@@ -202,6 +200,10 @@
|
|
||||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
|
||||||
echo "${machine}-${os}${release}"
|
|
||||||
exit ;;
|
|
||||||
+ *:Bitrig:*:*)
|
|
||||||
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
|
|
||||||
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
|
|
||||||
+ exit ;;
|
|
||||||
*:OpenBSD:*:*)
|
|
||||||
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
|
|
||||||
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
|
||||||
@@ -304,7 +306,7 @@
|
|
||||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
|
||||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
- arm:riscos:*:*|arm:RISCOS:*:*)
|
|
||||||
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
|
|
||||||
echo arm-unknown-riscos
|
|
||||||
exit ;;
|
|
||||||
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
|
|
||||||
@@ -803,6 +805,9 @@
|
|
||||||
i*:CYGWIN*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-cygwin
|
|
||||||
exit ;;
|
|
||||||
+ *:MINGW64*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-pc-mingw64
|
|
||||||
+ exit ;;
|
|
||||||
*:MINGW*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-mingw32
|
|
||||||
exit ;;
|
|
||||||
@@ -863,6 +868,13 @@
|
|
||||||
i*86:Minix:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-minix
|
|
||||||
exit ;;
|
|
||||||
+ aarch64:Linux:*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
+ exit ;;
|
|
||||||
+ aarch64_be:Linux:*:*)
|
|
||||||
+ UNAME_MACHINE=aarch64_be
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
+ exit ;;
|
|
||||||
alpha:Linux:*:*)
|
|
||||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
||||||
EV5) UNAME_MACHINE=alphaev5 ;;
|
|
||||||
@@ -1196,6 +1208,9 @@
|
|
||||||
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
|
||||||
echo i586-pc-haiku
|
|
||||||
exit ;;
|
|
||||||
+ x86_64:Haiku:*:*)
|
|
||||||
+ echo x86_64-unknown-haiku
|
|
||||||
+ exit ;;
|
|
||||||
SX-4:SUPER-UX:*:*)
|
|
||||||
echo sx4-nec-superux${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
@@ -1251,7 +1266,7 @@
|
|
||||||
NEO-?:NONSTOP_KERNEL:*:*)
|
|
||||||
echo neo-tandem-nsk${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
- NSE-?:NONSTOP_KERNEL:*:*)
|
|
||||||
+ NSE-*:NONSTOP_KERNEL:*:*)
|
|
||||||
echo nse-tandem-nsk${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
NSR-?:NONSTOP_KERNEL:*:*)
|
|
||||||
@@ -1320,11 +1335,11 @@
|
|
||||||
i*86:AROS:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-aros
|
|
||||||
exit ;;
|
|
||||||
+ x86_64:VMkernel:*:*)
|
|
||||||
+ echo ${UNAME_MACHINE}-unknown-esx
|
|
||||||
+ exit ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
||||||
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
|
||||||
-
|
|
||||||
eval $set_cc_for_build
|
|
||||||
cat >$dummy.c <<EOF
|
|
||||||
#ifdef _SEQUENT_
|
|
||||||
diff -urN octave-3.6.4/build-aux/config.sub octave-3.6.4-aarch64/build-aux/config.sub
|
|
||||||
--- octave-3.6.4/build-aux/config.sub 2013-02-21 14:19:21.000000000 -0600
|
|
||||||
+++ octave-3.6.4-aarch64/build-aux/config.sub 2013-03-03 06:51:19.347538029 -0600
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
||||||
# 2011, 2012 Free Software Foundation, Inc.
|
|
||||||
|
|
||||||
-timestamp='2012-01-01'
|
|
||||||
+timestamp='2012-10-10'
|
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
|
||||||
@@ -21,9 +21,7 @@
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
-# along with this program; if not, write to the Free Software
|
|
||||||
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
||||||
-# 02110-1301, USA.
|
|
||||||
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
@@ -125,13 +123,17 @@
|
|
||||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|
||||||
case $maybe_os in
|
|
||||||
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
|
||||||
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
|
||||||
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
|
||||||
knetbsd*-gnu* | netbsd*-gnu* | \
|
|
||||||
kopensolaris*-gnu* | \
|
|
||||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
||||||
os=-$maybe_os
|
|
||||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
|
||||||
;;
|
|
||||||
+ android-linux)
|
|
||||||
+ os=-linux-android
|
|
||||||
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
|
||||||
+ ;;
|
|
||||||
*)
|
|
||||||
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
|
|
||||||
if [ $basic_machine != $1 ]
|
|
||||||
@@ -154,7 +156,7 @@
|
|
||||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
|
||||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
|
||||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
|
||||||
- -apple | -axis | -knuth | -cray | -microblaze)
|
|
||||||
+ -apple | -axis | -knuth | -cray | -microblaze*)
|
|
||||||
os=
|
|
||||||
basic_machine=$1
|
|
||||||
;;
|
|
||||||
@@ -223,6 +225,12 @@
|
|
||||||
-isc*)
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
||||||
;;
|
|
||||||
+ -lynx*178)
|
|
||||||
+ os=-lynxos178
|
|
||||||
+ ;;
|
|
||||||
+ -lynx*5)
|
|
||||||
+ os=-lynxos5
|
|
||||||
+ ;;
|
|
||||||
-lynx*)
|
|
||||||
os=-lynxos
|
|
||||||
;;
|
|
||||||
@@ -247,6 +255,7 @@
|
|
||||||
# Some are omitted here because they have special meanings below.
|
|
||||||
1750a | 580 \
|
|
||||||
| a29k \
|
|
||||||
+ | aarch64 | aarch64_be \
|
|
||||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
|
||||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
|
||||||
| am33_2.0 \
|
|
||||||
@@ -264,7 +273,7 @@
|
|
||||||
| le32 | le64 \
|
|
||||||
| lm32 \
|
|
||||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
|
||||||
- | maxq | mb | microblaze | mcore | mep | metag \
|
|
||||||
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
|
|
||||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
|
||||||
| mips16 \
|
|
||||||
| mips64 | mips64el \
|
|
||||||
@@ -319,7 +328,7 @@
|
|
||||||
c6x)
|
|
||||||
basic_machine=tic6x-unknown
|
|
||||||
;;
|
|
||||||
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
|
|
||||||
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
|
|
||||||
basic_machine=$basic_machine-unknown
|
|
||||||
os=-none
|
|
||||||
;;
|
|
||||||
@@ -332,7 +341,10 @@
|
|
||||||
strongarm | thumb | xscale)
|
|
||||||
basic_machine=arm-unknown
|
|
||||||
;;
|
|
||||||
-
|
|
||||||
+ xgate)
|
|
||||||
+ basic_machine=$basic_machine-unknown
|
|
||||||
+ os=-none
|
|
||||||
+ ;;
|
|
||||||
xscaleeb)
|
|
||||||
basic_machine=armeb-unknown
|
|
||||||
;;
|
|
||||||
@@ -355,6 +367,7 @@
|
|
||||||
# Recognize the basic CPU types with company name.
|
|
||||||
580-* \
|
|
||||||
| a29k-* \
|
|
||||||
+ | aarch64-* | aarch64_be-* \
|
|
||||||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
|
||||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
|
||||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
|
||||||
@@ -376,7 +389,8 @@
|
|
||||||
| lm32-* \
|
|
||||||
| m32c-* | m32r-* | m32rle-* \
|
|
||||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
||||||
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
|
||||||
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
|
||||||
+ | microblaze-* | microblazeel-* \
|
|
||||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
|
||||||
| mips16-* \
|
|
||||||
| mips64-* | mips64el-* \
|
|
||||||
@@ -775,9 +789,13 @@
|
|
||||||
basic_machine=ns32k-utek
|
|
||||||
os=-sysv
|
|
||||||
;;
|
|
||||||
- microblaze)
|
|
||||||
+ microblaze*)
|
|
||||||
basic_machine=microblaze-xilinx
|
|
||||||
;;
|
|
||||||
+ mingw64)
|
|
||||||
+ basic_machine=x86_64-pc
|
|
||||||
+ os=-mingw64
|
|
||||||
+ ;;
|
|
||||||
mingw32)
|
|
||||||
basic_machine=i386-pc
|
|
||||||
os=-mingw32
|
|
||||||
@@ -1339,15 +1357,15 @@
|
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
||||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
|
||||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
|
||||||
- | -openbsd* | -solidbsd* \
|
|
||||||
+ | -bitrig* | -openbsd* | -solidbsd* \
|
|
||||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
|
||||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
|
||||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
||||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
||||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
|
||||||
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
||||||
- | -mingw32* | -linux-gnu* | -linux-android* \
|
|
||||||
- | -linux-newlib* | -linux-uclibc* \
|
|
||||||
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
|
||||||
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
|
|
||||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
||||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
||||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
||||||
@@ -1530,6 +1548,9 @@
|
|
||||||
c4x-* | tic4x-*)
|
|
||||||
os=-coff
|
|
||||||
;;
|
|
||||||
+ hexagon-*)
|
|
||||||
+ os=-elf
|
|
||||||
+ ;;
|
|
||||||
tic54x-*)
|
|
||||||
os=-coff
|
|
||||||
;;
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
--- octave-3.6.4-rc0/scripts/pkg/pkg.m.deps 2012-12-21 20:44:11.309702885 -0700
|
|
||||||
+++ octave-3.6.4-rc0/scripts/pkg/pkg.m 2012-12-21 20:51:19.529914112 -0700
|
|
||||||
@@ -633,12 +633,12 @@
|
|
||||||
endif
|
|
||||||
files(1) = [];
|
|
||||||
buildlist = fullfile (builddir, "octave_packages");
|
|
||||||
- install (files, handle_deps, autoload, installdir, installdir, verbose,
|
|
||||||
+ install (files, false, autoload, installdir, installdir, verbose,
|
|
||||||
buildlist, "", false);
|
|
||||||
unwind_protect
|
|
||||||
repackage (builddir, buildlist);
|
|
||||||
unwind_protect_cleanup
|
|
||||||
- unload_packages ({"all"}, handle_deps, buildlist, "");
|
|
||||||
+ unload_packages ({"all"}, false, buildlist, "");
|
|
||||||
if (exist (installdir, "dir"))
|
|
||||||
rm_rf (installdir);
|
|
||||||
endif
|
|
||||||
Loading…
Reference in New Issue
Block a user