some fixes

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31f381228d8e..ced094bb2f95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dosbox-gcc
 	pkgdesc = djgpp cross-compiler for the dosbox environment
 	pkgver = 11.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gcc.gnu.org
 	arch = i686
 	arch = x86_64
@@ -11,6 +11,8 @@ pkgbase = dosbox-gcc
 	license = FDL
 	license = custom
 	makedepends = unzip
+	makedepends = tar
+	makedepends = xz
 	depends = zlib
 	depends = libmpc
 	depends = dosbox-binutils
diff --git a/PKGBUILD b/PKGBUILD
index 4ef0856dc5c8..6fbf41a0e58c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@ pkgver=11.3.0
 _target="i586-pc-msdosdjgpp"
 _islver=0.24
 _djver=2.05
-pkgrel=1
+pkgrel=2
 pkgdesc="djgpp cross-compiler for the dosbox environment"
 arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
 license=('GPL' 'LGPL' 'FDL' 'custom')
 groups=('djgpp')
 depends=('zlib' 'libmpc' 'dosbox-binutils')
-makedepends=('unzip')
+makedepends=('unzip' 'tar' 'xz')
 optdepends=('dosbox-djcrx: headers and utilities')
 options=('!strip' 'staticlibs' '!emptydirs')
 source=("https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-$pkgver.tar.xz"
@@ -56,19 +56,18 @@ prepare() {
 }
 
 build() {
-  export ac_cv_func_shl_load=no
-  export ac_cv_lib_dld_shl_load=no
-  export ac_cv_func_dlopen=no
-  export ac_cv_lib_dl_dlopen=no
-  export ac_cv_lib_svld_dlopen=no
-  export ac_cv_lib_dld_dld_link=no
-
   cd gcc-build-$_target
   ../gcc-$pkgver/configure \
     --prefix=/usr \
     --libexecdir=/usr/lib \
     --datarootdir=/usr/$_target/share \
     --target="$_target" \
+    --with-arch=i586 \
+    --with-cpu=i586 \
+    --with-isl \
+    --with-system-zlib \
+    --disable-decimal-float \
+    --disable-gcov \
     --disable-ld \
     --disable-nls \
     --disable-install-libiberty \
@@ -77,24 +76,28 @@ build() {
     --disable-libquadmath-support \
     --disable-libgomp \
     --disable-libsanitizer \
-    --disable-decimal-float \
+    --disable-multilib \
     --enable-gold \
     --enable-languages=c,c++ \
+    --enable-lto \
     --enable-shared \
     --enable-static \
-    --with-isl \
-    --with-system-zlib \
-    --with-arch=i586 \
-    --with-cpu=i586 \
     --disable-threads \
     --disable-libstdcxx-pch \
     --disable-libstdcxx-threads \
-    --enable-lto \
+    --enable-cxx-flags="-O3 -fno-plt" \
     --enable-libstdcxx-filesystem-ts \
-    --disable-libstdcxx-time \
-    --disable-multilib --enable-checking=release
+    --enable-libstdcxx-time=no \
+    --enable-checking=release
   make all-gcc
 
+  export ac_cv_func_dlopen=no
+  export ac_cv_func_shl_load=no
+  export ac_cv_lib_dld_shl_load=no
+  export ac_cv_lib_dl_dlopen=no
+  export ac_cv_lib_svld_dlopen=no
+  export ac_cv_lib_dld_dld_link=no
+
   cd $srcdir/gcc-build-$_target
   make all
 }