add cutsom makepkg.conf's

3 files changed, 52 insertions, 2 deletions

diff --git a/archPackagesUpdate b/archPackagesUpdate
index ab1bc8da2..89a387fec 100755
--- a/archPackagesUpdate
+++ b/archPackagesUpdate
@@ -143,6 +143,13 @@ if ${aufRechenknecht}
 then
   maxErr=0
 
+# generate current makepkg.conf and makepkg32.conf
+  cd "${tmpDir}"
+  cp /etc/makepkg.conf .
+  patch -p0 -i makepkgSystem.patch
+  cp makepkg{,32}.conf
+  patch -p0 -i makepkg32.patch
+
 # build packages
   for ((i=0; i<${#pakete[@]}; i++))
   do
@@ -159,7 +166,7 @@ then
       echo '\
         sudo pacman -Sy && \
         cd "'"${tmpDir}/${paket}"'" && \
-        _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg -fcsr --noconfirm && \
+        _targetHost='\''--host=i686-pc-linux-gnu'\'' makepkg --config "'"${tmpDir}"'/makepkg32.conf" -fcsr --noconfirm && \
         exit\
       ' | \
         chrootUnpriv
@@ -167,7 +174,7 @@ then
     else
       # everything else is built directly
       sudo pacman -Sy
-      makepkg -fcsr --noconfirm
+      makepkg --config "${tmpDir}/makepkg.conf" -fcsr --noconfirm
       err[${i}]=$?
     fi
     if ${abortOnMakepkgError} && [ ${err[${i}]} -ne 0 ]
diff --git a/makepkg32.patch b/makepkg32.patch
new file mode 100644
index 000000000..0581a4091
--- /dev/null
+++ b/makepkg32.patch
@@ -0,0 +1,22 @@
+--- makepkg32.conf	2016-04-13 09:43:35.042178024 +0200
++++ makepkg32.conf	2016-04-13 09:44:16.263054427 +0200
+@@ -30,15 +30,15 @@
+ # ARCHITECTURE, COMPILE FLAGS
+ #########################################################################
+ #
+-CARCH="x86_64"
+-CHOST="x86_64-unknown-linux-gnu"
++CARCH="i686"
++CHOST="i686-unknown-linux-gnu"
+ 
+ #-- Compiler and Linker Flags
+ # -march (or -mcpu) builds exclusively for an architecture
+ # -mtune optimizes for an architecture, but builds for whole processor family
+ CPPFLAGS="-D_FORTIFY_SOURCE=2"
+-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
++CFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
++CXXFLAGS="-m32 -march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
+ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+ #-- Make Flags: change this for DistCC/SMP systems
+ MAKEFLAGS="-j4"
diff --git a/makepkgSystem.patch b/makepkgSystem.patch
new file mode 100644
index 000000000..eeeea5348
--- /dev/null
+++ b/makepkgSystem.patch
@@ -0,0 +1,21 @@
+--- makepkg.conf	2016-04-07 00:16:07.721500790 +0200
++++ makepkg.conf	2016-04-13 09:43:35.042178024 +0200
+@@ -113,15 +113,15 @@
+ #-- Destination: specify a fixed directory where all packages will be placed
+ #PKGDEST=/home/packages
+ #-- Source cache: specify a fixed directory where source files will be cached
+-#SRCDEST=/home/sources
++SRCDEST=/home/erich/packageSources
+ #-- Source packages: specify a fixed directory where all src packages will be placed
+ #SRCPKGDEST=/home/srcpackages
+ #-- Log files: specify a fixed directory where all log files will be placed
+ #LOGDEST=/home/makepkglogs
+ #-- Packager: name/email of the person or organization building packages
+-#PACKAGER="John Doe <john@doe.com>"
++PACKAGER="Erich Eckner <arch@eckner.net>"
+ #-- Specify a key to use for package signing
+-#GPGKEY=""
++GPGKEY="7C98C4C3DE926168DC46FBAA3D06644243BF68D3"
+ 
+ #########################################################################
+ # COMPRESSION DEFAULTS