From f10b3807287a7893f1dcdac82f0970ab0384e2b2 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 28 Sep 2017 12:10:52 -0500 Subject: Removing gcc-gcj --- pcr/gcc-gcj/PKGBUILD | 112 ---------------------------------------- pcr/gcc-gcj/gcc-gcj.install | 20 ------- pcr/gcc-gcj/gcc_pure64.patch | 26 ---------- pcr/gcc-gcj/libjava-sjlj.dpatch | 65 ----------------------- 4 files changed, 223 deletions(-) delete mode 100644 pcr/gcc-gcj/PKGBUILD delete mode 100644 pcr/gcc-gcj/gcc-gcj.install delete mode 100644 pcr/gcc-gcj/gcc_pure64.patch delete mode 100755 pcr/gcc-gcj/libjava-sjlj.dpatch diff --git a/pcr/gcc-gcj/PKGBUILD b/pcr/gcc-gcj/PKGBUILD deleted file mode 100644 index 2648936fa..000000000 --- a/pcr/gcc-gcj/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# Maintainer (Arch): Joey Dumont -# Contributor (Arch): Renan Manola -# Contributor (Arch): Stefan Husmann -# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES -# Based on a modified version of the gcc PKGBUILD - -pkgname=gcc-gcj -pkgver=4.9.2 -pkgrel=1 -pkgdesc="The GNU Compiler for Java" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL') -url="http://gcc.gnu.org" -depends=('gtk2' 'libxtst' 'alsa-lib' 'cloog>=0.16.2-1' 'libmpc>=0.8.2-2' 'classpath') -makedepends=('mpfr>=2.4.2-2' 'elfutils' 'jack' 'zip' 'gcc=4.9.2' 'libart-lgpl') -optdepends=('python2: for running /usr/bin/aot-compile' - 'java-environment: for runnig some jars') -options=('!libtool') -install=$pkgname.install -source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2") -sha512sums=('e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c') - -build() { - cd "$srcdir"/gcc-${pkgver} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - # Installs x86_64 libraries /lib - [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 - - # Uses python version 3 as default python - sed -i '1s+python+python2+' libjava/contrib/aot-compile.in - - echo ${pkgver} > gcc/BASE-VER - [ -d build ] || mkdir build - - cd build - - ../configure --prefix=/usr --enable-shared --enable-languages=java \ - --enable-threads=posix --mandir=/usr/share/man --infodir=/usr/share/info \ - --enable-__cxa_atexit --disable-multilib --libdir=/usr/lib \ - --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch \ - --with-tune=generic --enable-java-awt=gtk --with-java-home="$JAVA_HOME" \ - --enable-libgcj-multifile --disable-plugin --with-system-zlib - CPPFLAGS="$CPPFLAGS -O2" - make -} - -package() { - cd "$srcdir"/gcc-${pkgver}/build - make -j1 DESTDIR=${pkgdir} install-target-libjava - - cd gcc - make -j1 DESTDIR=${pkgdir} java.install-common java.install-man - - install -m755 jc1 ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/ - install -m755 jvgenmain ${pkgdir}/usr/lib/gcc/${CHOST}/${pkgver}/ - - # Remove files which belong to the base gcc package - rm -f ${pkgdir}/usr/bin/{c,g}++ - if [ "${CARCH}" = "x86_64" ]; then - rm -f ${pkgdir}/usr/bin/x86_64-unknown-linux-gnu-{c,g}++ - else - rm -f ${pkgdir}/usr/bin/i686-pc-linux-gnu-{c,g}++ - fi - rm -f ${pkgdir}/usr/man/man1/g++.* - # Rename two files to not conflict to classpath - mv ${pkgdir}/usr/share/info/cp-tools.info ${pkgdir}/usr/share/info/cp-tools-gcj.info - mv ${pkgdir}/usr/share/man/man1/gjdoc.1 ${pkgdir}/usr/share/man/man1/gjdoc.gcj.1 - cd $pkgdir - [[ $CARCH == "x86_64" ]] && rm usr/lib/libgcc_s.so usr/lib/libgcc_s.so.1 \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtbegin.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtbeginS.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtbeginT.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtend.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtendS.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtfastmath.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtprec32.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtprec64.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtprec80.o \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/include/unwind.h \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/libgcc.a \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/libgcc_eh.a \ - usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/libgcov.a - [[ $CARCH == "i686" ]] && rm usr/lib/libgcc_s.so usr/lib/libgcc_s.so.1 \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtbegin.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtbeginS.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtbeginT.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtend.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtendS.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtfastmath.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtprec32.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtprec64.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtprec80.o \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/include/unwind.h \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/libgcc.a \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/libgcc_eh.a \ - usr/lib/gcc/i686-pc-linux-gnu/$pkgver/libgcov.a - - find ${pkgdir}/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \; - - linkdir=`basename $pkgdir/usr/lib/gcj-${pkgver}*` - ln -sf $linkdir ${pkgdir}/usr/lib/gcj-${pkgver%.?} - ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-${pkgver%.?}.jar - ln -sf libgcj-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj.jar - ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools-${pkgver%.?}.jar - ln -sf libgcj-tools-${pkgver}.jar ${pkgdir}/usr/share/java/libgcj-tools.jar -} diff --git a/pcr/gcc-gcj/gcc-gcj.install b/pcr/gcc-gcj/gcc-gcj.install deleted file mode 100644 index 916aa6a17..000000000 --- a/pcr/gcc-gcj/gcc-gcj.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cp-tools-gcj.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} \ No newline at end of file diff --git a/pcr/gcc-gcj/gcc_pure64.patch b/pcr/gcc-gcj/gcc_pure64.patch deleted file mode 100644 index a9b09bbcf..000000000 --- a/pcr/gcc-gcj/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h ---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000 -@@ -28,6 +28,6 @@ - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64 ---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000 -@@ -34,8 +34,8 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 - - LIBGCC = stmp-multilib diff --git a/pcr/gcc-gcj/libjava-sjlj.dpatch b/pcr/gcc-gcj/libjava-sjlj.dpatch deleted file mode 100755 index 95b4673b3..000000000 --- a/pcr/gcc-gcj/libjava-sjlj.dpatch +++ /dev/null @@ -1,65 +0,0 @@ -#! /bin/sh -e - -# DP: Don't try to use _Unwind_Backtrace on SJLJ targets. -# DP: See bug #387875, #388505, GCC PR 29206. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p1 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- - libjava/sysdep/generic/backtrace.h | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -Index: src/libjava/sysdep/generic/backtrace.h -=================================================================== ---- src.orig/libjava/sysdep/generic/backtrace.h 2006-11-06 14:00:32.000000000 -0500 -+++ src/libjava/sysdep/generic/backtrace.h 2006-11-06 14:04:38.000000000 -0500 -@@ -13,6 +13,20 @@ details. */ - - #include - -+#ifdef SJLJ_EXCEPTIONS -+ -+#undef _Unwind_GetIPInfo -+#define _Unwind_GetIPInfo(ctx,ip_before_insn) \ -+ (abort (), (void) (ctx), *ip_before_insn = 1, 0) -+ -+#undef _Unwind_GetRegionStart -+#define _Unwind_GetRegionStart(ctx) \ -+ (abort (), (void) (ctx), 0) -+ -+#undef _Unwind_Backtrace -+#define _Unwind_Backtrace(trace_fn,state_ptr) \ -+ (fallback_backtrace (trace_fn, state_ptr)) -+ - /* Unwind through the call stack calling TRACE_FN with STATE for every stack - frame. Returns the reason why the unwinding was stopped. */ - _Unwind_Reason_Code -@@ -20,4 +34,7 @@ fallback_backtrace (_Unwind_Trace_Fn, _J - { - return _URC_NO_REASON; - } -+ -+#endif /* SJLJ_EXCEPTIONS */ -+ - #endif -- cgit v1.2.3