diff options
| author | Erich Eckner <git@eckner.net> | 2018-05-30 08:42:19 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-05-30 08:42:19 +0200 |
| commit | 3b09820d45d0a8c133393770a4384250b0b489e4 (patch) | |
| tree | 7a34c46b6e399316917afeb9d5acbb99b3dda085 | |
| parent | 8623461d999517b55ac1cfe0b159f0e1cdb06422 (diff) | |
| download | archlinuxewe.git.save-3b09820d45d0a8c133393770a4384250b0b489e4.tar.xz | |
makepkg{32,System}.patch: adapt to new upstream /etc/makepkg.conf
| -rw-r--r-- | makepkg32.patch | 8 | ||||
| -rw-r--r-- | makepkgSystem.patch | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/makepkg32.patch b/makepkg32.patch index 48b29e7f..6790bea4 100644 --- a/makepkg32.patch +++ b/makepkg32.patch @@ -1,6 +1,6 @@ ---- makepkg32.conf 2016-04-13 09:43:35.042178024 +0200 -+++ makepkg32.conf 2016-04-13 09:44:16.263054427 +0200 -@@ -30,15 +30,15 @@ +--- makepkg32.conf 2018-05-30 08:38:02.885358183 +0200 ++++ makepkg32.conf 2018-05-30 08:40:25.575856939 +0200 +@@ -32,13 +32,13 @@ # ARCHITECTURE, COMPILE FLAGS ######################################################################### # @@ -10,8 +10,6 @@ +CHOST="i686-pc-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 -fno-plt" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" diff --git a/makepkgSystem.patch b/makepkgSystem.patch index 424f5151..b16fe879 100644 --- a/makepkgSystem.patch +++ b/makepkgSystem.patch @@ -1,21 +1,21 @@ ---- makepkg.conf 2016-04-07 00:16:07.721500790 +0200 -+++ makepkg.conf 2016-04-13 09:43:35.042178024 +0200 +--- makepkg.conf 2018-05-30 08:38:22.167804726 +0200 ++++ makepkg.conf 2018-05-30 08:38:02.885358183 +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/makepkg/packageSources ++SRCDEST='/home/makepkg/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="Erich Eckner <arch32 at eckner dot net>" -+PACKAGER="Erich Eckner <arch@eckner.net>" ++PACKAGER='Erich Eckner <arch at eckner dot net>' #-- Specify a key to use for package signing -#GPGKEY="" -+GPGKEY="5FDCA472AB93292BC678FD59255A76DB9A12601A" ++GPGKEY='5FDCA472AB93292BC678FD59255A76DB9A12601A' ######################################################################### # COMPRESSION DEFAULTS |