4.9.0-4
This commit is contained in:
parent
58525d3c9e
commit
83a8e4c260
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/gcc-4.9.0-20140422.tar.bz2
|
||||
/gcc-4.9.0-20140505.tar.bz2
|
||||
/gcc-4.9.0-20140506.tar.bz2
|
||||
/gcc-4.9.0-20140514.tar.bz2
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,14 +0,0 @@
|
||||
2010-03-01 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
* jartool.c (read_entries): Properly zero-terminate filename.
|
||||
|
||||
--- fastjar-0.97/jartool.c 6 Sep 2009 22:16:00 -0000 1.59
|
||||
+++ fastjar-0.97/jartool.c 1 Mar 2010 15:38:43 -0000 1.60
|
||||
@@ -790,6 +790,7 @@ int read_entries (int fd)
|
||||
progname, jarfile);
|
||||
return 1;
|
||||
}
|
||||
+ ze->filename[len] = '\0';
|
||||
len = UNPACK_UB4(header, CEN_EFLEN);
|
||||
len += UNPACK_UB4(header, CEN_COMLEN);
|
||||
if (lseek (fd, len, SEEK_CUR) == -1)
|
@ -1,16 +0,0 @@
|
||||
2009-12-21 Chris Ball <cjb@laptop.org>
|
||||
|
||||
* jartool.c (add_file_to_jar): Test write return value against -1
|
||||
instead of 1.
|
||||
|
||||
--- fastjar-0.97/jartool.c.jj 2008-10-15 12:35:37.000000000 -0400
|
||||
+++ fastjar-0.97/jartool.c 2009-12-22 06:48:09.309530000 -0500
|
||||
@@ -1257,7 +1257,7 @@ int add_file_to_jar(int jfd, int ffd, co
|
||||
exit_on_error("write");
|
||||
|
||||
/* write the file name to the zip file */
|
||||
- if (1 == write(jfd, fname, file_name_length))
|
||||
+ if (-1 == write(jfd, fname, file_name_length))
|
||||
exit_on_error("write");
|
||||
|
||||
if(verbose){
|
@ -1,708 +0,0 @@
|
||||
--- fastjar-0.97/m4/libtool.m4.jj 2008-10-16 10:14:54.000000000 +0200
|
||||
+++ fastjar-0.97/m4/libtool.m4 2014-04-10 20:41:26.563064023 +0200
|
||||
@@ -1263,7 +1263,7 @@ ia64-*-hpux*)
|
||||
rm -rf conftest*
|
||||
;;
|
||||
|
||||
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
|
||||
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
||||
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
||||
# Find out which ABI we are using.
|
||||
echo 'int i;' > conftest.$ac_ext
|
||||
@@ -1277,7 +1277,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
- ppc64-*linux*|powerpc64-*linux*)
|
||||
+ powerpc64le-*linux*)
|
||||
+ LD="${LD-ld} -m elf32lppclinux"
|
||||
+ ;;
|
||||
+ powerpc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
@@ -1296,7 +1299,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_x86_64"
|
||||
;;
|
||||
- ppc*-*linux*|powerpc*-*linux*)
|
||||
+ powerpcle-*linux*)
|
||||
+ LD="${LD-ld} -m elf64lppc"
|
||||
+ ;;
|
||||
+ powerpc-*linux*)
|
||||
LD="${LD-ld} -m elf64ppc"
|
||||
;;
|
||||
s390*-*linux*|s390*-*tpf*)
|
||||
--- fastjar-0.97/config.sub.jj 2014-04-10 20:40:53.000000000 +0200
|
||||
+++ fastjar-0.97/config.sub 2014-04-10 10:38:39.000000000 +0200
|
||||
@@ -1,24 +1,18 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
-# 2011, 2012 Free Software Foundation, Inc.
|
||||
-
|
||||
-timestamp='2012-04-18'
|
||||
-
|
||||
-# This file is (in principle) common to ALL GNU software.
|
||||
-# The presence of a machine in this file suggests that SOME GNU software
|
||||
-# can handle that machine. It does not imply ALL GNU software can.
|
||||
-#
|
||||
-# 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
|
||||
-# the Free Software Foundation; either version 2 of the License, or
|
||||
+# Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
+
|
||||
+timestamp='2013-10-01'
|
||||
+
|
||||
+# 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
|
||||
+# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
-# This program is distributed in the hope that it will be useful,
|
||||
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
-# GNU General Public License for more details.
|
||||
+# This program is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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, see <http://www.gnu.org/licenses/>.
|
||||
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
-# the same distribution terms that you use for the rest of that program.
|
||||
+# the same distribution terms that you use for the rest of that
|
||||
+# program. This Exception is an additional permission under section 7
|
||||
+# of the GNU General Public License, version 3 ("GPLv3").
|
||||
|
||||
|
||||
-# Please send patches to <config-patches@gnu.org>. Submit a context
|
||||
-# diff and a properly formatted GNU ChangeLog entry.
|
||||
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
||||
#
|
||||
# Configuration subroutine to validate and canonicalize a configuration type.
|
||||
# Supply the specified configuration type as an argument.
|
||||
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patch
|
||||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
||||
-Free Software Foundation, Inc.
|
||||
+Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -123,7 +116,7 @@ esac
|
||||
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*)
|
||||
@@ -156,7 +149,7 @@ case $os in
|
||||
-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
|
||||
;;
|
||||
@@ -259,10 +252,12 @@ case $basic_machine in
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
- | be32 | be64 \
|
||||
+ | arc | arceb \
|
||||
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
|
||||
+ | avr | avr32 \
|
||||
+ | be32 | be64 \
|
||||
| bfin \
|
||||
- | c4x | clipper \
|
||||
+ | c4x | c8051 | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
| epiphany \
|
||||
| fido | fr30 | frv \
|
||||
@@ -270,10 +265,11 @@ case $basic_machine in
|
||||
| hexagon \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
+ | k1om \
|
||||
| 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 \
|
||||
@@ -291,16 +287,17 @@ case $basic_machine in
|
||||
| mipsisa64r2 | mipsisa64r2el \
|
||||
| mipsisa64sb1 | mipsisa64sb1el \
|
||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
+ | mipsr5900 | mipsr5900el \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mn10200 | mn10300 \
|
||||
| moxie \
|
||||
| mt \
|
||||
| msp430 \
|
||||
| nds32 | nds32le | nds32be \
|
||||
- | nios | nios2 \
|
||||
+ | nios | nios2 | nios2eb | nios2el \
|
||||
| ns16k | ns32k \
|
||||
| open8 \
|
||||
- | or32 \
|
||||
+ | or1k | or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle \
|
||||
| pyramid \
|
||||
@@ -328,7 +325,7 @@ case $basic_machine in
|
||||
c6x)
|
||||
basic_machine=tic6x-unknown
|
||||
;;
|
||||
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
|
||||
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
|
||||
basic_machine=$basic_machine-unknown
|
||||
os=-none
|
||||
;;
|
||||
@@ -370,13 +367,13 @@ case $basic_machine in
|
||||
| aarch64-* | aarch64_be-* \
|
||||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| avr-* | avr32-* \
|
||||
| be32-* | be64-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* \
|
||||
- | clipper-* | craynv-* | cydra-* \
|
||||
+ | c8051-* | clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
@@ -385,11 +382,13 @@ case $basic_machine in
|
||||
| hexagon-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
+ | k1om-* \
|
||||
| le32-* | le64-* \
|
||||
| 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-* \
|
||||
@@ -407,12 +406,13 @@ case $basic_machine in
|
||||
| mipsisa64r2-* | mipsisa64r2el-* \
|
||||
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
+ | mipsr5900-* | mipsr5900el-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| mmix-* \
|
||||
| mt-* \
|
||||
| msp430-* \
|
||||
| nds32-* | nds32le-* | nds32be-* \
|
||||
- | nios-* | nios2-* \
|
||||
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| open8-* \
|
||||
| orion-* \
|
||||
@@ -788,11 +788,15 @@ case $basic_machine in
|
||||
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
|
||||
+ basic_machine=i686-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
mingw32ce)
|
||||
@@ -828,7 +832,7 @@ case $basic_machine in
|
||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
||||
;;
|
||||
msys)
|
||||
- basic_machine=i386-pc
|
||||
+ basic_machine=i686-pc
|
||||
os=-msys
|
||||
;;
|
||||
mvs)
|
||||
@@ -1019,7 +1023,11 @@ case $basic_machine in
|
||||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
- rdos)
|
||||
+ rdos | rdos64)
|
||||
+ basic_machine=x86_64-pc
|
||||
+ os=-rdos
|
||||
+ ;;
|
||||
+ rdos32)
|
||||
basic_machine=i386-pc
|
||||
os=-rdos
|
||||
;;
|
||||
@@ -1346,21 +1354,21 @@ case $os in
|
||||
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
||||
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
||||
- | -sym* | -kopensolaris* \
|
||||
+ | -sym* | -kopensolaris* | -plan9* \
|
||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
||||
| -aos* | -aros* \
|
||||
| -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* \
|
||||
@@ -1492,9 +1500,6 @@ case $os in
|
||||
-aros*)
|
||||
os=-aros
|
||||
;;
|
||||
- -kaos*)
|
||||
- os=-kaos
|
||||
- ;;
|
||||
-zvmoe)
|
||||
os=-zvmoe
|
||||
;;
|
||||
@@ -1543,6 +1548,9 @@ case $basic_machine in
|
||||
c4x-* | tic4x-*)
|
||||
os=-coff
|
||||
;;
|
||||
+ c8051-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
hexagon-*)
|
||||
os=-elf
|
||||
;;
|
||||
@@ -1586,6 +1594,9 @@ case $basic_machine in
|
||||
mips*-*)
|
||||
os=-elf
|
||||
;;
|
||||
+ or1k-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
or32-*)
|
||||
os=-coff
|
||||
;;
|
||||
--- fastjar-0.97/config.guess.jj 2014-04-10 20:40:53.000000000 +0200
|
||||
+++ fastjar-0.97/config.guess 2014-04-10 10:38:36.000000000 +0200
|
||||
@@ -1,14 +1,12 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
-# 2011, 2012 Free Software Foundation, Inc.
|
||||
+# Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
-timestamp='2012-06-10'
|
||||
+timestamp='2013-06-10'
|
||||
|
||||
# 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
|
||||
-# the Free Software Foundation; either version 2 of the License, or
|
||||
+# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
@@ -22,19 +20,17 @@ timestamp='2012-06-10'
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
# configuration script generated by Autoconf, you may include it under
|
||||
-# the same distribution terms that you use for the rest of that program.
|
||||
-
|
||||
-
|
||||
-# Originally written by Per Bothner. Please send patches (context
|
||||
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
|
||||
-# entry.
|
||||
+# the same distribution terms that you use for the rest of that
|
||||
+# program. This Exception is an additional permission under section 7
|
||||
+# of the GNU General Public License, version 3 ("GPLv3").
|
||||
#
|
||||
-# This script attempts to guess a canonical system name similar to
|
||||
-# config.sub. If it succeeds, it prints the system name on stdout, and
|
||||
-# exits with 0. Otherwise, it exits with 1.
|
||||
+# Originally written by Per Bothner.
|
||||
#
|
||||
# You can get the latest version of this script from:
|
||||
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
||||
+#
|
||||
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
||||
+
|
||||
|
||||
me=`echo "$0" | sed -e 's,.*/,,'`
|
||||
|
||||
@@ -54,9 +50,7 @@ version="\
|
||||
GNU config.guess ($timestamp)
|
||||
|
||||
Originally written by Per Bothner.
|
||||
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
||||
-Free Software Foundation, Inc.
|
||||
+Copyright 1992-2013 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
|
||||
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
||||
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
||||
|
||||
+case "${UNAME_SYSTEM}" in
|
||||
+Linux|GNU|GNU/*)
|
||||
+ # If the system lacks a compiler, then just pick glibc.
|
||||
+ # We could probably try harder.
|
||||
+ LIBC=gnu
|
||||
+
|
||||
+ eval $set_cc_for_build
|
||||
+ cat <<-EOF > $dummy.c
|
||||
+ #include <features.h>
|
||||
+ #if defined(__UCLIBC__)
|
||||
+ LIBC=uclibc
|
||||
+ #elif defined(__dietlibc__)
|
||||
+ LIBC=dietlibc
|
||||
+ #else
|
||||
+ LIBC=gnu
|
||||
+ #endif
|
||||
+ EOF
|
||||
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
||||
# 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}
|
||||
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
||||
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:*:*)
|
||||
@@ -801,6 +820,9 @@ EOF
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
+ *:MINGW64*:*)
|
||||
+ echo ${UNAME_MACHINE}-pc-mingw64
|
||||
+ exit ;;
|
||||
*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
@@ -852,21 +874,21 @@ EOF
|
||||
exit ;;
|
||||
*:GNU:*:*)
|
||||
# the GNU system
|
||||
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
exit ;;
|
||||
*:GNU/*:*:*)
|
||||
# other systems with GNU libc and userland
|
||||
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
|
||||
exit ;;
|
||||
i*86:Minix:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit ;;
|
||||
aarch64:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
aarch64_be:Linux:*:*)
|
||||
UNAME_MACHINE=aarch64_be
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
alpha:Linux:*:*)
|
||||
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
||||
@@ -879,59 +901,54 @@ EOF
|
||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||
esac
|
||||
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
||||
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
+ exit ;;
|
||||
+ arc:Linux:*:* | arceb:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_EABI__
|
||||
then
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
else
|
||||
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ARM_PCS_VFP
|
||||
then
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
|
||||
else
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
|
||||
fi
|
||||
fi
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-axis-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
crisv32:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-axis-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
||||
exit ;;
|
||||
frv:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
hexagon:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
- LIBC=gnu
|
||||
- eval $set_cc_for_build
|
||||
- sed 's/^ //' << EOF >$dummy.c
|
||||
- #ifdef __dietlibc__
|
||||
- LIBC=dietlibc
|
||||
- #endif
|
||||
-EOF
|
||||
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
||||
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
|
||||
exit ;;
|
||||
ia64:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m32r*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
m68*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
mips:Linux:*:* | mips64:Linux:*:*)
|
||||
eval $set_cc_for_build
|
||||
@@ -950,54 +967,63 @@ EOF
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
||||
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
||||
;;
|
||||
+ or1k:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
+ exit ;;
|
||||
or32:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
padre:Linux:*:*)
|
||||
- echo sparc-unknown-linux-gnu
|
||||
+ echo sparc-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
||||
- echo hppa64-unknown-linux-gnu
|
||||
+ echo hppa64-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
parisc:Linux:*:* | hppa:Linux:*:*)
|
||||
# Look for CPU level
|
||||
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
||||
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
|
||||
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
|
||||
- *) echo hppa-unknown-linux-gnu ;;
|
||||
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
|
||||
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
|
||||
+ *) echo hppa-unknown-linux-${LIBC} ;;
|
||||
esac
|
||||
exit ;;
|
||||
ppc64:Linux:*:*)
|
||||
- echo powerpc64-unknown-linux-gnu
|
||||
+ echo powerpc64-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
ppc:Linux:*:*)
|
||||
- echo powerpc-unknown-linux-gnu
|
||||
+ echo powerpc-unknown-linux-${LIBC}
|
||||
+ exit ;;
|
||||
+ ppc64le:Linux:*:*)
|
||||
+ echo powerpc64le-unknown-linux-${LIBC}
|
||||
+ exit ;;
|
||||
+ ppcle:Linux:*:*)
|
||||
+ echo powerpcle-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
s390:Linux:*:* | s390x:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-ibm-linux
|
||||
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
|
||||
exit ;;
|
||||
sh64*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
sh*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
tile*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
xtensa*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
i*86:DYNIX/ptx:4*:*)
|
||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
||||
@@ -1201,6 +1227,9 @@ EOF
|
||||
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 ;;
|
||||
@@ -1227,19 +1256,21 @@ EOF
|
||||
exit ;;
|
||||
*:Darwin:*:*)
|
||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||
- case $UNAME_PROCESSOR in
|
||||
- i386)
|
||||
- eval $set_cc_for_build
|
||||
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
- grep IS_64BIT_ARCH >/dev/null
|
||||
- then
|
||||
- UNAME_PROCESSOR="x86_64"
|
||||
- fi
|
||||
- fi ;;
|
||||
- unknown) UNAME_PROCESSOR=powerpc ;;
|
||||
- esac
|
||||
+ eval $set_cc_for_build
|
||||
+ if test "$UNAME_PROCESSOR" = unknown ; then
|
||||
+ UNAME_PROCESSOR=powerpc
|
||||
+ fi
|
||||
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
+ grep IS_64BIT_ARCH >/dev/null
|
||||
+ then
|
||||
+ case $UNAME_PROCESSOR in
|
||||
+ i386) UNAME_PROCESSOR=x86_64 ;;
|
||||
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
|
||||
+ esac
|
||||
+ fi
|
||||
+ fi
|
||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:procnto*:*:* | *:QNX:[0123456789]*:*)
|
||||
@@ -1330,9 +1361,6 @@ EOF
|
||||
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_
|
||||
--- fastjar-0.97/configure.jj 2008-10-16 10:15:10.000000000 +0200
|
||||
+++ fastjar-0.97/configure 2014-04-10 20:43:07.458531730 +0200
|
||||
@@ -6918,7 +6918,7 @@ ia64-*-hpux*)
|
||||
rm -rf conftest*
|
||||
;;
|
||||
|
||||
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
|
||||
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
||||
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
||||
# Find out which ABI we are using.
|
||||
echo 'int i;' > conftest.$ac_ext
|
||||
@@ -6936,7 +6936,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_i386"
|
||||
;;
|
||||
- ppc64-*linux*|powerpc64-*linux*)
|
||||
+ powerpc64le-*linux*)
|
||||
+ LD="${LD-ld} -m elf32lppclinux"
|
||||
+ ;;
|
||||
+ powerpc64-*linux*)
|
||||
LD="${LD-ld} -m elf32ppclinux"
|
||||
;;
|
||||
s390x-*linux*)
|
||||
@@ -6955,7 +6958,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
||||
x86_64-*linux*)
|
||||
LD="${LD-ld} -m elf_x86_64"
|
||||
;;
|
||||
- ppc*-*linux*|powerpc*-*linux*)
|
||||
+ powerpcle-*linux*)
|
||||
+ LD="${LD-ld} -m elf64lppc"
|
||||
+ ;;
|
||||
+ powerpc-*linux*)
|
||||
LD="${LD-ld} -m elf64ppc"
|
||||
;;
|
||||
s390*-*linux*|s390*-*tpf*)
|
@ -1,29 +0,0 @@
|
||||
2009-01-14 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* jartool.c (make_manifest): Initialize current_time before
|
||||
calling unix2dostime on it.
|
||||
|
||||
--- fastjar-0.97/jartool.c.jj 2008-10-15 18:35:37.000000000 +0200
|
||||
+++ fastjar-0.97/jartool.c 2009-01-14 15:40:50.000000000 +0100
|
||||
@@ -820,6 +820,10 @@ int make_manifest(int jfd, const char *m
|
||||
int mod_time; /* file modification time */
|
||||
struct zipentry *ze;
|
||||
|
||||
+ current_time = time(NULL);
|
||||
+ if(current_time == (time_t)-1)
|
||||
+ exit_on_error("time");
|
||||
+
|
||||
mod_time = unix2dostime(¤t_time);
|
||||
|
||||
/* If we are creating a new manifest, create a META-INF directory entry */
|
||||
@@ -828,10 +832,6 @@ int make_manifest(int jfd, const char *m
|
||||
|
||||
memset((file_header + 12), '\0', 16); /*clear mod time, crc, size fields*/
|
||||
|
||||
- current_time = time(NULL);
|
||||
- if(current_time == (time_t)-1)
|
||||
- exit_on_error("time");
|
||||
-
|
||||
PACK_UB2(file_header, LOC_EXTRA, 0);
|
||||
PACK_UB2(file_header, LOC_COMP, 0);
|
||||
PACK_UB2(file_header, LOC_FNLEN, nlen);
|
@ -1,102 +0,0 @@
|
||||
2010-06-10 Jakub Jelinek <jakub@redhat.com>
|
||||
Dan Rosenberg <dan.j.rosenberg@gmail.com>
|
||||
|
||||
* jartool.c (extract_jar): Fix up checks for traversal to parent
|
||||
directories, disallow absolute paths, make the code slightly more
|
||||
efficient.
|
||||
|
||||
--- fastjar-0.97/jartool.c.jj 2009-09-07 00:10:47.000000000 +0200
|
||||
+++ fastjar-0.97/jartool.c 2010-06-08 20:00:29.000000000 +0200
|
||||
@@ -1730,7 +1730,17 @@ int extract_jar(int fd, const char **fil
|
||||
struct stat sbuf;
|
||||
int depth = 0;
|
||||
|
||||
- tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
|
||||
+ if(*filename == '/'){
|
||||
+ fprintf(stderr, "Absolute path names are not allowed.\n");
|
||||
+ exit(EXIT_FAILURE);
|
||||
+ }
|
||||
+
|
||||
+ tmp_buff = malloc(strlen((const char *)filename));
|
||||
+
|
||||
+ if(tmp_buff == NULL) {
|
||||
+ fprintf(stderr, "Out of memory.\n");
|
||||
+ exit(EXIT_FAILURE);
|
||||
+ }
|
||||
|
||||
for(;;){
|
||||
const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
|
||||
@@ -1738,25 +1748,28 @@ int extract_jar(int fd, const char **fil
|
||||
if(idx == NULL)
|
||||
break;
|
||||
else if(idx == start){
|
||||
+ tmp_buff[idx - filename] = '/';
|
||||
start++;
|
||||
continue;
|
||||
}
|
||||
- start = idx + 1;
|
||||
|
||||
- strncpy(tmp_buff, (const char *)filename, (idx - filename));
|
||||
- tmp_buff[(idx - filename)] = '\0';
|
||||
+ memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
|
||||
+ tmp_buff[idx - filename] = '\0';
|
||||
|
||||
#ifdef DEBUG
|
||||
printf("checking the existance of %s\n", tmp_buff);
|
||||
#endif
|
||||
- if(strcmp(tmp_buff, "..") == 0){
|
||||
+ if(idx - start == 2 && memcmp(start, "..", 2) == 0){
|
||||
--depth;
|
||||
if (depth < 0){
|
||||
fprintf(stderr, "Traversal to parent directories during unpacking!\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
- } else if (strcmp(tmp_buff, ".") != 0)
|
||||
+ } else if (idx - start != 1 || *start != '.')
|
||||
++depth;
|
||||
+
|
||||
+ start = idx + 1;
|
||||
+
|
||||
if(stat(tmp_buff, &sbuf) < 0){
|
||||
if(errno != ENOENT)
|
||||
exit_on_error("stat");
|
||||
@@ -1765,6 +1778,7 @@ int extract_jar(int fd, const char **fil
|
||||
#ifdef DEBUG
|
||||
printf("Directory exists\n");
|
||||
#endif
|
||||
+ tmp_buff[idx - filename] = '/';
|
||||
continue;
|
||||
}else {
|
||||
fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
|
||||
@@ -1781,10 +1795,11 @@ int extract_jar(int fd, const char **fil
|
||||
if(verbose && handle)
|
||||
printf("%10s: %s/\n", "created", tmp_buff);
|
||||
|
||||
+ tmp_buff[idx - filename] = '/';
|
||||
}
|
||||
|
||||
/* only a directory */
|
||||
- if(strlen((const char *)start) == 0)
|
||||
+ if(*start == '\0')
|
||||
dir = TRUE;
|
||||
|
||||
#ifdef DEBUG
|
||||
@@ -1792,7 +1807,7 @@ int extract_jar(int fd, const char **fil
|
||||
#endif
|
||||
|
||||
/* If the entry was just a directory, don't write to file, etc */
|
||||
- if(strlen((const char *)start) == 0)
|
||||
+ if(*start == '\0')
|
||||
f_fd = -1;
|
||||
|
||||
free(tmp_buff);
|
||||
@@ -1876,7 +1891,8 @@ int extract_jar(int fd, const char **fil
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
- close(f_fd);
|
||||
+ if (f_fd != -1)
|
||||
+ close(f_fd);
|
||||
|
||||
if(verbose && dir == FALSE && handle)
|
||||
printf("%10s: %s\n",
|
@ -1,27 +0,0 @@
|
||||
2010-03-24 Jan Kratochvil <jan.kratochvil@redhat.com>
|
||||
|
||||
* Makefile.am (POD2MAN): Provide --date from ChangeLog.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
--- fastjar-0.97/Makefile.am.jj 2008-10-16 04:24:55.000000000 -0400
|
||||
+++ fastjar-0.97/Makefile.am 2010-06-21 09:29:41.021398000 -0400
|
||||
@@ -39,7 +39,7 @@ EXTRA_DIST = \
|
||||
texi2pod.pl
|
||||
|
||||
TEXI2POD = perl $(srcdir)/texi2pod.pl
|
||||
-POD2MAN = pod2man --center="GNU" --release=@VERSION@
|
||||
+POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
|
||||
|
||||
.pod.1:
|
||||
-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
|
||||
--- fastjar-0.97/Makefile.in.jj 2008-10-16 04:15:16.000000000 -0400
|
||||
+++ fastjar-0.97/Makefile.in 2010-06-21 09:30:15.882810000 -0400
|
||||
@@ -515,7 +515,7 @@ EXTRA_DIST = \
|
||||
texi2pod.pl
|
||||
|
||||
TEXI2POD = perl $(srcdir)/texi2pod.pl
|
||||
-POD2MAN = pod2man --center="GNU" --release=@VERSION@
|
||||
+POD2MAN = pod2man --center="GNU" --release=@VERSION@ --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/ChangeLog)
|
||||
|
||||
#SPLINT_FLAGS=-I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H +posixlib +weak
|
||||
SPLINT_FLAGS = -I . -I $(srcdir)/lib -I $(srcdir) -DHAVE_CONFIG_H -DPRIx32= -warnposix +weak
|
454
gcc.spec
454
gcc.spec
@ -1,9 +1,9 @@
|
||||
%global DATE 20140506
|
||||
%global SVNREV 210097
|
||||
%global DATE 20140514
|
||||
%global SVNREV 210412
|
||||
%global gcc_version 4.9.0
|
||||
# Note, gcc_release must be integer, if you want to add suffixes to
|
||||
# %{release}, append them after %{gcc_release} on Release: line.
|
||||
%global gcc_release 3
|
||||
%global gcc_release 4
|
||||
%global _unpackaged_files_terminate_build 0
|
||||
%global _performance_build 1
|
||||
%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
|
||||
@ -12,7 +12,6 @@
|
||||
%else
|
||||
%global build_ada 0
|
||||
%endif
|
||||
%global build_java 0
|
||||
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
|
||||
%global build_go 1
|
||||
%else
|
||||
@ -65,12 +64,6 @@
|
||||
%else
|
||||
%global attr_ifunc 0
|
||||
%endif
|
||||
# If you don't have already a usable gcc-java and libgcj for your arch,
|
||||
# do on some arch which has it rpmbuild -bc --with java_tar gcc.spec
|
||||
# which creates libjava-classes-%{version}-%{release}.tar.bz2
|
||||
# With this then on the new arch do rpmbuild -ba -v --with java_bootstrap gcc.spec
|
||||
%global bootstrap_java %{?_with_java_bootstrap:%{build_java}}%{!?_with_java_bootstrap:0}
|
||||
%global build_java_tar %{?_with_java_tar:%{build_java}}%{!?_with_java_tar:0}
|
||||
%ifarch s390x
|
||||
%global multilib_32_arch s390
|
||||
%endif
|
||||
@ -100,8 +93,6 @@ Source0: gcc-%{version}-%{DATE}.tar.bz2
|
||||
Source1: ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2
|
||||
%global cloog_version 0.18.1
|
||||
Source2: ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-%{cloog_version}.tar.gz
|
||||
%global fastjar_ver 0.97
|
||||
Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
|
||||
URL: http://gcc.gnu.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
# Need binutils with -pie support >= 2.14.90.0.4-4
|
||||
@ -126,14 +117,6 @@ BuildRequires: hostname
|
||||
%endif
|
||||
# For VTA guality testing
|
||||
BuildRequires: gdb
|
||||
%if %{build_java}
|
||||
BuildRequires: /usr/share/java/eclipse-ecj.jar, zip, unzip
|
||||
%if %{bootstrap_java}
|
||||
Source10: libjava-classes-%{version}-%{release}.tar.bz2
|
||||
%else
|
||||
BuildRequires: gcc-java, libgcj
|
||||
%endif
|
||||
%endif
|
||||
# Make sure pthread.h doesn't contain __thread tokens
|
||||
# Make sure glibc supports stack protector
|
||||
# Make sure glibc supports DT_GNU_HASH
|
||||
@ -190,11 +173,8 @@ Requires: libgcc >= %{version}-%{release}
|
||||
Requires: libgomp = %{version}-%{release}
|
||||
%if !%{build_ada}
|
||||
Obsoletes: gcc-gnat < %{version}-%{release}
|
||||
Obsoletes: libgnat < %{version}-%{release}
|
||||
%endif
|
||||
Obsoletes: libmudflap
|
||||
Obsoletes: libmudflap-devel
|
||||
Obsoletes: libmudflap-static
|
||||
Obsoletes: gcc-java < %{version}-%{release}
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
AutoReq: true
|
||||
@ -218,14 +198,6 @@ Patch15: gcc49-color-auto.patch
|
||||
Patch16: gcc49-libgo-p224.patch
|
||||
Patch17: gcc49-aarch64-ada.patch
|
||||
|
||||
Patch1000: fastjar-0.97-segfault.patch
|
||||
Patch1001: fastjar-0.97-len1.patch
|
||||
Patch1002: fastjar-0.97-filename0.patch
|
||||
Patch1003: fastjar-CVE-2010-0831.patch
|
||||
Patch1004: fastjar-man.patch
|
||||
Patch1005: fastjar-0.97-aarch64-config.patch
|
||||
Patch1006: fastjar-0.97-ppc64le-config.patch
|
||||
|
||||
Patch1100: cloog-%{cloog_version}-ppc64le-config.patch
|
||||
|
||||
# On ARM EABI systems, we do want -gnueabi to be part of the
|
||||
@ -251,6 +223,15 @@ You'll need this package in order to compile C code.
|
||||
Summary: GCC version 4.9 shared support library
|
||||
Group: System Environment/Libraries
|
||||
Autoreq: false
|
||||
%if !%{build_ada}
|
||||
Obsoletes: libgnat < %{version}-%{release}
|
||||
%endif
|
||||
Obsoletes: libmudflap
|
||||
Obsoletes: libmudflap-devel
|
||||
Obsoletes: libmudflap-static
|
||||
Obsoletes: libgcj < %{version}-%{release}
|
||||
Obsoletes: libgcj-devel < %{version}-%{release}
|
||||
Obsoletes: libgcj-src < %{version}-%{release}
|
||||
|
||||
%description -n libgcc
|
||||
This package contains GCC shared support library which is needed
|
||||
@ -555,66 +536,6 @@ Requires: libcilkrts = %{version}-%{release}
|
||||
%description -n libcilkrts-static
|
||||
This package contains the Cilk+ static runtime library.
|
||||
|
||||
%package java
|
||||
Summary: Java support for GCC
|
||||
Group: Development/Languages
|
||||
Requires: gcc = %{version}-%{release}
|
||||
Requires: libgcj = %{version}-%{release}
|
||||
Requires: libgcj-devel = %{version}-%{release}
|
||||
Requires: /usr/share/java/eclipse-ecj.jar
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
Autoreq: true
|
||||
|
||||
%description java
|
||||
This package adds support for compiling Java(tm) programs and
|
||||
bytecode into native code.
|
||||
|
||||
%package -n libgcj
|
||||
Summary: Java runtime library for gcc
|
||||
Group: System Environment/Libraries
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
Requires: zip >= 2.1
|
||||
Requires: gtk2 >= 2.4.0
|
||||
Requires: glib2 >= 2.4.0
|
||||
Requires: libart_lgpl >= 2.1.0
|
||||
%if %{build_java}
|
||||
BuildRequires: gtk2-devel >= 2.4.0
|
||||
BuildRequires: glib2-devel >= 2.4.0
|
||||
BuildRequires: libart_lgpl-devel >= 2.1.0
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: libXtst-devel
|
||||
BuildRequires: libXt-devel
|
||||
%endif
|
||||
Autoreq: true
|
||||
|
||||
%description -n libgcj
|
||||
The Java(tm) runtime library. You will need this package to run your Java
|
||||
programs compiled using the Java compiler from GNU Compiler Collection (gcj).
|
||||
|
||||
%package -n libgcj-devel
|
||||
Summary: Libraries for Java development using GCC
|
||||
Group: Development/Languages
|
||||
Requires: libgcj%{?_isa} = %{version}-%{release}
|
||||
Requires: zlib-devel%{?_isa}
|
||||
Requires: /bin/awk
|
||||
Autoreq: false
|
||||
Autoprov: false
|
||||
|
||||
%description -n libgcj-devel
|
||||
The Java(tm) static libraries and C header files. You will need this
|
||||
package to compile your Java programs using the GCC Java compiler (gcj).
|
||||
|
||||
%package -n libgcj-src
|
||||
Summary: Java library sources from GCC4 preview
|
||||
Group: System Environment/Libraries
|
||||
Requires: libgcj = %{version}-%{release}
|
||||
Autoreq: true
|
||||
|
||||
%description -n libgcj-src
|
||||
The Java(tm) runtime library sources for use in Eclipse.
|
||||
|
||||
%package -n cpp
|
||||
Summary: The C Preprocessor
|
||||
Group: Development/Languages
|
||||
@ -851,25 +772,8 @@ EOF
|
||||
chmod 755 split-debuginfo.sh
|
||||
%endif
|
||||
|
||||
# This testcase doesn't compile.
|
||||
rm libjava/testsuite/libjava.lang/PR35020*
|
||||
|
||||
tar xzf %{SOURCE4}
|
||||
|
||||
%patch1000 -p0 -b .fastjar-0.97-segfault~
|
||||
%patch1001 -p0 -b .fastjar-0.97-len1~
|
||||
%patch1002 -p0 -b .fastjar-0.97-filename0~
|
||||
%patch1003 -p0 -b .fastjar-CVE-2010-0831~
|
||||
%patch1004 -p0 -b .fastjar-man~
|
||||
%patch1005 -p0 -b .fastjar-0.97-aarch64-config~
|
||||
%patch1006 -p0 -b .fastjar-0.97-ppc64le-config~
|
||||
|
||||
%patch1100 -p0 -b .cloog-ppc64le-config~
|
||||
|
||||
%if %{bootstrap_java}
|
||||
tar xjf %{SOURCE10}
|
||||
%endif
|
||||
|
||||
sed -i -e 's/4\.9\.1/4.9.0/' gcc/BASE-VER
|
||||
echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
|
||||
|
||||
@ -927,51 +831,10 @@ rm -f gcc/testsuite/go.test/test/chan/goroutines.go
|
||||
# Undo the broken autoconf change in recent Fedora versions
|
||||
export CONFIG_SITE=NONE
|
||||
|
||||
%if %{build_java}
|
||||
export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true
|
||||
# gjar isn't usable, so even when GCC source tree no longer includes
|
||||
# fastjar, build it anyway.
|
||||
mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
|
||||
cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
|
||||
../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir}
|
||||
make %{?_smp_mflags}
|
||||
export PATH=`pwd`${PATH:+:$PATH}
|
||||
cd ../../
|
||||
%endif
|
||||
|
||||
rm -fr obj-%{gcc_target_platform}
|
||||
mkdir obj-%{gcc_target_platform}
|
||||
cd obj-%{gcc_target_platform}
|
||||
|
||||
%if %{build_java}
|
||||
%if !%{bootstrap_java}
|
||||
# If we don't have gjavah in $PATH, try to build it with the old gij
|
||||
mkdir java_hacks
|
||||
cd java_hacks
|
||||
cp -a ../../libjava/classpath/tools/external external
|
||||
mkdir -p gnu/classpath/tools
|
||||
cp -a ../../libjava/classpath/tools/gnu/classpath/tools/{common,javah,getopt} gnu/classpath/tools/
|
||||
cp -a ../../libjava/classpath/tools/resource/gnu/classpath/tools/common/messages.properties gnu/classpath/tools/common
|
||||
cp -a ../../libjava/classpath/tools/resource/gnu/classpath/tools/getopt/messages.properties gnu/classpath/tools/getopt
|
||||
cd external/asm; for i in `find . -name \*.java`; do gcj --encoding ISO-8859-1 -C $i -I.; done; cd ../..
|
||||
for i in `find gnu -name \*.java`; do gcj -C $i -I. -Iexternal/asm/; done
|
||||
gcj -findirect-dispatch -O2 -fmain=gnu.classpath.tools.javah.Main -I. -Iexternal/asm/ `find . -name \*.class` -o gjavah.real
|
||||
cat > gjavah <<EOF
|
||||
#!/bin/sh
|
||||
export CLASSPATH=`pwd`${CLASSPATH:+:$CLASSPATH}
|
||||
exec `pwd`/gjavah.real "\$@"
|
||||
EOF
|
||||
chmod +x `pwd`/gjavah
|
||||
cat > ecj1 <<EOF
|
||||
#!/bin/sh
|
||||
exec gij -cp /usr/share/java/eclipse-ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
|
||||
EOF
|
||||
chmod +x `pwd`/ecj1
|
||||
export PATH=`pwd`${PATH:+:$PATH}
|
||||
cd ..
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{build_cloog}
|
||||
mkdir isl-build isl-install
|
||||
%ifarch s390 s390x
|
||||
@ -1072,20 +935,9 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
|
||||
%endif
|
||||
--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
|
||||
--enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu \
|
||||
--enable-languages=c,c++,objc,obj-c++,java,fortran${enablelada}${enablelgo},lto \
|
||||
--enable-languages=c,c++,objc,obj-c++,fortran${enablelada}${enablelgo},lto \
|
||||
--enable-plugin --enable-initfini-array \
|
||||
%if !%{build_java}
|
||||
--disable-libgcj \
|
||||
%else
|
||||
--enable-java-awt=gtk --disable-dssi \
|
||||
--with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
|
||||
--enable-libgcj-multifile \
|
||||
%if !%{bootstrap_java}
|
||||
--enable-java-maintainer-mode \
|
||||
%endif
|
||||
--with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
|
||||
--disable-libjava-multilib \
|
||||
%endif
|
||||
%if %{build_cloog}
|
||||
--with-isl=`pwd`/isl-install --with-cloog=`pwd`/cloog-install \
|
||||
%else
|
||||
@ -1187,7 +1039,6 @@ cd ../..
|
||||
# Copy various doc files here and there
|
||||
cd ..
|
||||
mkdir -p rpm.doc/gfortran rpm.doc/objc
|
||||
mkdir -p rpm.doc/boehm-gc rpm.doc/fastjar rpm.doc/libffi rpm.doc/libjava
|
||||
mkdir -p rpm.doc/go rpm.doc/libgo rpm.doc/libquadmath rpm.doc/libitm
|
||||
mkdir -p rpm.doc/changelogs/{gcc/cp,gcc/java,gcc/ada,libstdc++-v3,libobjc,libgomp,libatomic,libsanitizer,libcilkrts}
|
||||
|
||||
@ -1204,19 +1055,6 @@ done)
|
||||
(cd libobjc; for i in README*; do
|
||||
cp -p $i ../rpm.doc/objc/$i.libobjc
|
||||
done)
|
||||
(cd boehm-gc; for i in ChangeLog*; do
|
||||
cp -p $i ../rpm.doc/boehm-gc/$i.gc
|
||||
done)
|
||||
(cd fastjar-%{fastjar_ver}; for i in ChangeLog* README*; do
|
||||
cp -p $i ../rpm.doc/fastjar/$i.fastjar
|
||||
done)
|
||||
(cd libffi; for i in ChangeLog* README* LICENSE; do
|
||||
cp -p $i ../rpm.doc/libffi/$i.libffi
|
||||
done)
|
||||
(cd libjava; for i in ChangeLog* README*; do
|
||||
cp -p $i ../rpm.doc/libjava/$i.libjava
|
||||
done)
|
||||
cp -p libjava/LIBGCJ_LICENSE rpm.doc/libjava/
|
||||
%if %{build_libquadmath}
|
||||
(cd libquadmath; for i in ChangeLog* COPYING.LIB; do
|
||||
cp -p $i ../rpm.doc/libquadmath/$i.libquadmath
|
||||
@ -1239,26 +1077,11 @@ done)
|
||||
rm -f rpm.doc/changelogs/gcc/ChangeLog.[1-9]
|
||||
find rpm.doc -name \*ChangeLog\* | xargs bzip2 -9
|
||||
|
||||
%if %{build_java_tar}
|
||||
find libjava -name \*.h -type f | xargs grep -l '// DO NOT EDIT THIS FILE - it is machine generated' > libjava-classes.list
|
||||
find libjava -name \*.class -type f >> libjava-classes.list
|
||||
find libjava/testsuite -name \*.jar -type f >> libjava-classes.list
|
||||
tar cf - -T libjava-classes.list | bzip2 -9 > $RPM_SOURCE_DIR/libjava-classes-%{version}-%{release}.tar.bz2
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -fr %{buildroot}
|
||||
|
||||
cd obj-%{gcc_target_platform}
|
||||
|
||||
%if %{build_java}
|
||||
export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true
|
||||
export PATH=`pwd`/../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}${PATH:+:$PATH}
|
||||
%if !%{bootstrap_java}
|
||||
export PATH=`pwd`/java_hacks${PATH:+:$PATH}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
TARGET_PLATFORM=%{gcc_target_platform}
|
||||
|
||||
# There are some MP bugs in libstdc++ Makefiles
|
||||
@ -1266,9 +1089,6 @@ make -C %{gcc_target_platform}/libstdc++-v3
|
||||
|
||||
make prefix=%{buildroot}%{_prefix} mandir=%{buildroot}%{_mandir} \
|
||||
infodir=%{buildroot}%{_infodir} install
|
||||
%if %{build_java}
|
||||
make DESTDIR=%{buildroot} -C %{gcc_target_platform}/libjava install-src.zip
|
||||
%endif
|
||||
%if %{build_ada}
|
||||
chmod 644 %{buildroot}%{_infodir}/gnat*
|
||||
%endif
|
||||
@ -1366,18 +1186,6 @@ else
|
||||
fi
|
||||
|
||||
find %{buildroot} -name \*.la | xargs rm -f
|
||||
%if %{build_java}
|
||||
# gcj -static doesn't work properly anyway, unless using --whole-archive
|
||||
# and saving 35MB is not bad.
|
||||
find %{buildroot} -name libgcj.a -o -name libgtkpeer.a \
|
||||
-o -name libgjsmalsa.a -o -name libgcj-tools.a -o -name libjvm.a \
|
||||
-o -name libgij.a -o -name libgcj_bc.a -o -name libjavamath.a \
|
||||
| xargs rm -f
|
||||
|
||||
mv %{buildroot}%{_prefix}/lib/libgcj.spec $FULLPATH/
|
||||
sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/' \
|
||||
$FULLPATH/libgcj.spec
|
||||
%endif
|
||||
|
||||
mv %{buildroot}%{_prefix}/%{_lib}/libgfortran.spec $FULLPATH/
|
||||
%if %{build_libitm}
|
||||
@ -1438,13 +1246,6 @@ else
|
||||
ln -sf POSIX_V6_LP64_OFF64 %{buildroot}%{_prefix}/libexec/getconf/default
|
||||
fi
|
||||
|
||||
%if %{build_java}
|
||||
pushd ../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
|
||||
make install DESTDIR=%{buildroot}
|
||||
popd
|
||||
|
||||
%endif
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++*gdb.py* \
|
||||
%{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/
|
||||
@ -1483,11 +1284,6 @@ ln -sf ../../../libubsan.so.0.* libubsan.so
|
||||
%if %{build_libcilkrts}
|
||||
ln -sf ../../../libcilkrts.so.5.* libcilkrts.so
|
||||
%endif
|
||||
%if %{build_java}
|
||||
ln -sf ../../../libgcj.so.15.* libgcj.so
|
||||
ln -sf ../../../libgcj-tools.so.15.* libgcj-tools.so
|
||||
ln -sf ../../../libgij.so.15.* libgij.so
|
||||
%endif
|
||||
else
|
||||
ln -sf ../../../../%{_lib}/libobjc.so.4 libobjc.so
|
||||
ln -sf ../../../../%{_lib}/libstdc++.so.6.*[0-9] libstdc++.so
|
||||
@ -1523,15 +1319,7 @@ echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libtsan.so.0.* | sed
|
||||
rm -f liblsan.so
|
||||
echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/liblsan.so.0.* | sed 's,^.*libl,libl,'`' )' > liblsan.so
|
||||
%endif
|
||||
%if %{build_java}
|
||||
ln -sf ../../../../%{_lib}/libgcj.so.15.* libgcj.so
|
||||
ln -sf ../../../../%{_lib}/libgcj-tools.so.15.* libgcj-tools.so
|
||||
ln -sf ../../../../%{_lib}/libgij.so.15.* libgij.so
|
||||
%endif
|
||||
fi
|
||||
%if %{build_java}
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libgcj_bc.so $FULLLPATH/
|
||||
%endif
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libsupc++.*a $FULLLPATH/
|
||||
mv -f %{buildroot}%{_prefix}/%{_lib}/libgfortran.*a $FULLLPATH/
|
||||
@ -1646,13 +1434,6 @@ rm -f libcilkrts.so
|
||||
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libcilkrts.so.5.* | sed 's,^.*libc,libc,'`' )' > libcilkrts.so
|
||||
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libcilkrts.so.5.* | sed 's,^.*libc,libc,'`' )' > 64/libcilkrts.so
|
||||
%endif
|
||||
%if %{build_java}
|
||||
ln -sf ../`echo ../../../../lib/libgcj.so.15.* | sed s~/lib/~/lib64/~` 64/libgcj.so
|
||||
ln -sf ../`echo ../../../../lib/libgcj-tools.so.15.* | sed s~/lib/~/lib64/~` 64/libgcj-tools.so
|
||||
ln -sf ../`echo ../../../../lib/libgij.so.15.* | sed s~/lib/~/lib64/~` 64/libgij.so
|
||||
ln -sf lib32/libgcj_bc.so libgcj_bc.so
|
||||
ln -sf ../lib64/libgcj_bc.so 64/libgcj_bc.so
|
||||
%endif
|
||||
ln -sf lib32/libgfortran.a libgfortran.a
|
||||
ln -sf ../lib64/libgfortran.a 64/libgfortran.a
|
||||
mv -f %{buildroot}%{_prefix}/lib64/libobjc.*a 64/
|
||||
@ -1740,11 +1521,6 @@ rm -f libcilkrts.so
|
||||
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libcilkrts.so.5.* | sed 's,^.*libc,libc,'`' )' > libcilkrts.so
|
||||
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libcilkrts.so.5.* | sed 's,^.*libc,libc,'`' )' > 32/libcilkrts.so
|
||||
%endif
|
||||
%if %{build_java}
|
||||
ln -sf ../`echo ../../../../lib64/libgcj.so.15.* | sed s~/../lib64/~/~` 32/libgcj.so
|
||||
ln -sf ../`echo ../../../../lib64/libgcj-tools.so.15.* | sed s~/../lib64/~/~` 32/libgcj-tools.so
|
||||
ln -sf ../`echo ../../../../lib64/libgij.so.15.* | sed s~/../lib64/~/~` 32/libgij.so
|
||||
%endif
|
||||
mv -f %{buildroot}%{_prefix}/lib/libobjc.*a 32/
|
||||
mv -f %{buildroot}%{_prefix}/lib/libgomp.*a 32/
|
||||
%endif
|
||||
@ -1785,10 +1561,6 @@ ln -sf lib64/libgo.a libgo.a
|
||||
ln -sf ../lib32/libgobegin.a 32/libgobegin.a
|
||||
ln -sf lib64/libgobegin.a libgobegin.a
|
||||
%endif
|
||||
%if %{build_java}
|
||||
ln -sf ../lib32/libgcj_bc.so 32/libgcj_bc.so
|
||||
ln -sf lib64/libgcj_bc.so libgcj_bc.so
|
||||
%endif
|
||||
%if %{build_ada}
|
||||
ln -sf ../lib32/adainclude 32/adainclude
|
||||
ln -sf lib64/adainclude adainclude
|
||||
@ -1822,9 +1594,6 @@ ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libc
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgo.a 32/libgo.a
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgobegin.a 32/libgobegin.a
|
||||
%endif
|
||||
%if %{build_java}
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/libgcj_bc.so 32/libgcj_bc.so
|
||||
%endif
|
||||
%if %{build_ada}
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/adainclude 32/adainclude
|
||||
ln -sf ../../../%{multilib_32_arch}-%{_vendor}-%{_target_os}/%{gcc_version}/adalib 32/adalib
|
||||
@ -1918,7 +1687,7 @@ cd ..
|
||||
|
||||
# Remove binaries we will not be including, so that they don't end up in
|
||||
# gcc-debuginfo
|
||||
rm -f %{buildroot}%{_prefix}/%{_lib}/{libffi*,libiberty.a}
|
||||
rm -f %{buildroot}%{_prefix}/%{_lib}/{libffi*,libiberty.a} || :
|
||||
rm -f $FULLEPATH/install-tools/{mkheaders,fixincl}
|
||||
rm -f %{buildroot}%{_prefix}/lib/{32,64}/libiberty.a
|
||||
rm -f %{buildroot}%{_prefix}/%{_lib}/libssp*
|
||||
@ -1954,15 +1723,6 @@ rm -rf %{buildroot}%{_prefix}/lib64/go/%{gcc_version}/%{gcc_target_platform}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{build_java}
|
||||
mkdir -p %{buildroot}%{_prefix}/share/java/gcj-endorsed \
|
||||
%{buildroot}%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
|
||||
chmod 755 %{buildroot}%{_prefix}/share/java/gcj-endorsed \
|
||||
%{buildroot}%{_prefix}/%{_lib}/gcj-%{version} \
|
||||
%{buildroot}%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
|
||||
touch %{buildroot}%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
|
||||
%endif
|
||||
|
||||
rm -f %{buildroot}%{mandir}/man3/ffi*
|
||||
|
||||
# Help plugins find out nvra.
|
||||
@ -1971,13 +1731,6 @@ echo gcc-%{version}-%{release}.%{_arch} > $FULLPATH/rpmver
|
||||
%check
|
||||
cd obj-%{gcc_target_platform}
|
||||
|
||||
%if %{build_java}
|
||||
export PATH=`pwd`/../fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}${PATH:+:$PATH}
|
||||
%if !%{bootstrap_java}
|
||||
export PATH=`pwd`/java_hacks${PATH:+:$PATH}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# run the tests.
|
||||
make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \
|
||||
%if 0%{?fedora} >= 20
|
||||
@ -2035,18 +1788,6 @@ if [ $1 = 0 -a -f %{_infodir}/gfortran.info.gz ]; then
|
||||
--info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || :
|
||||
fi
|
||||
|
||||
%post java
|
||||
if [ -f %{_infodir}/gcj.info.gz ]; then
|
||||
/sbin/install-info \
|
||||
--info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
|
||||
fi
|
||||
|
||||
%preun java
|
||||
if [ $1 = 0 -a -f %{_infodir}/gcj.info.gz ]; then
|
||||
/sbin/install-info --delete \
|
||||
--info-dir=%{_infodir} %{_infodir}/gcj.info.gz || :
|
||||
fi
|
||||
|
||||
%post gnat
|
||||
if [ -f %{_infodir}/gnat_rm.info.gz ]; then
|
||||
/sbin/install-info \
|
||||
@ -2098,25 +1839,6 @@ end
|
||||
|
||||
%postun -n libobjc -p /sbin/ldconfig
|
||||
|
||||
%post -n libgcj
|
||||
/sbin/ldconfig
|
||||
if [ -f %{_infodir}/cp-tools.info.gz ]; then
|
||||
/sbin/install-info \
|
||||
--info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
|
||||
/sbin/install-info \
|
||||
--info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
|
||||
fi
|
||||
|
||||
%preun -n libgcj
|
||||
if [ $1 = 0 -a -f %{_infodir}/cp-tools.info.gz ]; then
|
||||
/sbin/install-info --delete \
|
||||
--info-dir=%{_infodir} %{_infodir}/cp-tools.info.gz || :
|
||||
/sbin/install-info --delete \
|
||||
--info-dir=%{_infodir} %{_infodir}/fastjar.info.gz || :
|
||||
fi
|
||||
|
||||
%postun -n libgcj -p /sbin/ldconfig
|
||||
|
||||
%post -n libgfortran -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgfortran -p /sbin/ldconfig
|
||||
@ -2677,142 +2399,6 @@ fi
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a
|
||||
%endif
|
||||
|
||||
%if %{build_java}
|
||||
%files java
|
||||
%defattr(-,root,root,-)
|
||||
%{_prefix}/bin/gcj
|
||||
%{_prefix}/bin/gjavah
|
||||
%{_prefix}/bin/gcjh
|
||||
%{_prefix}/bin/jcf-dump
|
||||
%{_mandir}/man1/gcj.1*
|
||||
%{_mandir}/man1/jcf-dump.1*
|
||||
%{_mandir}/man1/gjavah.1*
|
||||
%{_mandir}/man1/gcjh.1*
|
||||
%{_infodir}/gcj*
|
||||
%dir %{_prefix}/libexec/gcc
|
||||
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
|
||||
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
|
||||
%dir %{_prefix}/lib/gcc
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jc1
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/ecj1
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jvgenmain
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so
|
||||
%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
|
||||
%endif
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so
|
||||
%ifarch sparcv9 ppc
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj-tools.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcj_bc.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgij.so
|
||||
%endif
|
||||
%ifarch %{multilib_64_archs}
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj-tools.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgcj_bc.so
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libgij.so
|
||||
%endif
|
||||
%doc rpm.doc/changelogs/gcc/java/ChangeLog*
|
||||
|
||||
%files -n libgcj
|
||||
%defattr(-,root,root,-)
|
||||
%{_prefix}/bin/jv-convert
|
||||
%{_prefix}/bin/gij
|
||||
%{_prefix}/bin/gjar
|
||||
%{_prefix}/bin/fastjar
|
||||
%{_prefix}/bin/gnative2ascii
|
||||
%{_prefix}/bin/grepjar
|
||||
%{_prefix}/bin/grmic
|
||||
%{_prefix}/bin/grmid
|
||||
%{_prefix}/bin/grmiregistry
|
||||
%{_prefix}/bin/gtnameserv
|
||||
%{_prefix}/bin/gkeytool
|
||||
%{_prefix}/bin/gorbd
|
||||
%{_prefix}/bin/gserialver
|
||||
%{_prefix}/bin/gcj-dbtool
|
||||
%{_prefix}/bin/gjarsigner
|
||||
%{_mandir}/man1/fastjar.1*
|
||||
%{_mandir}/man1/grepjar.1*
|
||||
%{_mandir}/man1/gjar.1*
|
||||
%{_mandir}/man1/gjarsigner.1*
|
||||
%{_mandir}/man1/jv-convert.1*
|
||||
%{_mandir}/man1/gij.1*
|
||||
%{_mandir}/man1/gnative2ascii.1*
|
||||
%{_mandir}/man1/grmic.1*
|
||||
%{_mandir}/man1/grmiregistry.1*
|
||||
%{_mandir}/man1/gcj-dbtool.1*
|
||||
%{_mandir}/man1/gkeytool.1*
|
||||
%{_mandir}/man1/gorbd.1*
|
||||
%{_mandir}/man1/grmid.1*
|
||||
%{_mandir}/man1/gserialver.1*
|
||||
%{_mandir}/man1/gtnameserv.1*
|
||||
%{_infodir}/fastjar.info*
|
||||
%{_infodir}/cp-tools.info*
|
||||
%{_prefix}/%{_lib}/libgcj.so.*
|
||||
%{_prefix}/%{_lib}/libgcj-tools.so.*
|
||||
%{_prefix}/%{_lib}/libgcj_bc.so.*
|
||||
%{_prefix}/%{_lib}/libgij.so.*
|
||||
%dir %{_prefix}/%{_lib}/gcj-%{version}
|
||||
%{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so
|
||||
%{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so
|
||||
%{_prefix}/%{_lib}/gcj-%{version}/libjawt.so
|
||||
%{_prefix}/%{_lib}/gcj-%{version}/libjvm.so
|
||||
%{_prefix}/%{_lib}/gcj-%{version}/libjavamath.so
|
||||
%dir %{_prefix}/share/java
|
||||
%{_prefix}/share/java/[^sl]*
|
||||
%{_prefix}/share/java/libgcj-%{version}.jar
|
||||
%dir %{_prefix}/%{_lib}/security
|
||||
%config(noreplace) %{_prefix}/%{_lib}/security/classpath.security
|
||||
%{_prefix}/%{_lib}/logging.properties
|
||||
%dir %{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
|
||||
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_prefix}/%{_lib}/gcj-%{version}/classmap.db
|
||||
|
||||
%files -n libgcj-devel
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_prefix}/lib/gcc
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/gcj
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jawt.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jawt_md.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jni.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jni_md.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/jvmpi.h
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.spec
|
||||
%ifarch sparcv9 ppc
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib32/libgcj_bc.so
|
||||
%endif
|
||||
%ifarch sparc64 ppc64 ppc64p7
|
||||
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgcj_bc.so
|
||||
%endif
|
||||
%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
|
||||
%endif
|
||||
%dir %{_prefix}/include/c++
|
||||
%dir %{_prefix}/include/c++/%{gcc_version}
|
||||
%{_prefix}/include/c++/%{gcc_version}/[gj]*
|
||||
%{_prefix}/include/c++/%{gcc_version}/org
|
||||
%{_prefix}/include/c++/%{gcc_version}/sun
|
||||
%{_prefix}/%{_lib}/pkgconfig/libgcj-*.pc
|
||||
%doc rpm.doc/boehm-gc/* rpm.doc/fastjar/* rpm.doc/libffi/*
|
||||
%doc rpm.doc/libjava/*
|
||||
|
||||
%files -n libgcj-src
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_prefix}/share/java
|
||||
%{_prefix}/share/java/src*.zip
|
||||
%{_prefix}/share/java/libgcj-tools-%{version}.jar
|
||||
%endif
|
||||
|
||||
%if %{build_ada}
|
||||
%files gnat
|
||||
%defattr(-,root,root,-)
|
||||
@ -3198,6 +2784,16 @@ fi
|
||||
%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
|
||||
|
||||
%changelog
|
||||
* Wed May 14 2014 Jakub Jelinek <jakub@redhat.com> 4.9.0-4
|
||||
- update from the 4.9 branch
|
||||
- PRs c++/60019, c++/60999, c++/61083, c++/61151, driver/61106, ipa/60973,
|
||||
libfortran/61049, libstdc++/60594, libstdc++/61023, libstdc++/61086,
|
||||
libstdc++/61117, target/59952, target/60991, target/61055,
|
||||
target/61060, target/61092, tree-optimization/57864,
|
||||
tree-optimization/60902, tree-optimization/61009
|
||||
- obsolete gcc-java and libjava*, remove all traces of build_java from the
|
||||
spec file (#1096474, #1095513)
|
||||
|
||||
* Tue May 6 2014 Jakub Jelinek <jakub@redhat.com> 4.9.0-3
|
||||
- update from the 4.9 branch
|
||||
- PRs driver/61065, ipa/60965
|
||||
|
3
sources
3
sources
@ -1,4 +1,3 @@
|
||||
e34fca0540d840e5d0f6427e98c92252 cloog-0.18.1.tar.gz
|
||||
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
|
||||
0bfea102c9592a24618b59943904dbb8 gcc-4.9.0-20140506.tar.bz2
|
||||
5aa859d383a96737831699ff25de5cf4 gcc-4.9.0-20140514.tar.bz2
|
||||
e039bfcfb6c2ab039b8ee69bf883e824 isl-0.12.2.tar.bz2
|
||||
|
Loading…
Reference in New Issue
Block a user