From c03d69c38dcc2fd707e4502b35c53b18cfdd2967 Mon Sep 17 00:00:00 2001 From: Alexpux Date: Thu, 26 Dec 2013 17:31:57 +0400 Subject: [PATCH] pacman: Fix config files. --- pacman/PKGBUILD | 16 +++++----------- pacman/makepkg-mingw | 5 +---- pacman/makepkg.conf | 11 ++--------- pacman/makepkg_mingw32.conf | 10 +++++----- pacman/makepkg_mingw64.conf | 10 +++++----- perl/perlrebase | 2 +- 6 files changed, 19 insertions(+), 35 deletions(-) mode change 100755 => 100644 pacman/makepkg-mingw mode change 100644 => 100755 perl/perlrebase diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 424e8d74..15fcc498 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pacman _base_ver=4.1.2 -pkgver=4.1.2.5561.b716664 +pkgver=4.1.2.5576.985002d pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') @@ -28,10 +28,10 @@ source=("$pkgname"::'git://github.com/Alexpux/MSYS2-pacman.git' md5sums=('SKIP' 'c5e8e1fac90fa490347d8cda49aea282' 'c5e8e1fac90fa490347d8cda49aea282' - 'fc4f7b4393304307f41c219beb3b4623' - '541a6a0ad0972b77d3a5d1aef1d0bbb1' - '3df7a12326723e3f7ae0ba08d7a7858b' - '68026294d8665b4561b23074b55594c2') + '7171a21594aa5aacd127d16872cb8f9e' + 'e06e337b0a8bafcee2afc0ba3bd3c7ae' + '6a70b004b6c533b50f21dbdd2f69d1a2' + '6cad738eb6cd246872adb96741404412') pkgver() { cd "$srcdir/$pkgname" @@ -72,16 +72,12 @@ package() { i686) mycarch="i686" mychost="i686-pc-msys" - mymingw="i686-w64-mingw32" myflags="-march=i686" - myprefix="/mingw32" ;; x86_64) mycarch="x86_64" mychost="x86_64-pc-msys" - mymingw="x86_64-w64-mingw32" myflags="-march=x86-64" - myprefix="/mingw64" ;; esac @@ -94,8 +90,6 @@ package() { sed -i $pkgdir/usr/etc/makepkg.conf \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ - -e "s|@MINGW_CHOST[@]|$mymingw|g" \ - -e "s|@MINGW_PREFIX[@]|$myprefix|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" # put bash_completion in the right location diff --git a/pacman/makepkg-mingw b/pacman/makepkg-mingw old mode 100755 new mode 100644 index 289f94aa..dd9b2aad --- a/pacman/makepkg-mingw +++ b/pacman/makepkg-mingw @@ -18,17 +18,14 @@ # declare -r MINGW_INSTALLS="mingw32 mingw64" -export ORIGINAL_PATH=$PATH for _mingw in ${MINGW_INSTALLS}; do if [ -f "/${_mingw}/bin/gcc.exe" ]; then PKG_CONFIG_PATH="/${_mingw}/lib/pkgconfig" \ - MSYSTEM=MINGW \ + MSYSTEM=MINGW32 \ PATH=/${_mingw}/bin:$PATH \ /usr/bin/makepkg --config /etc/makepkg_${_mingw}.conf $@ || exit 1 fi done -unset ORIGINAL_PATH - exit 0 diff --git a/pacman/makepkg.conf b/pacman/makepkg.conf index 3a8cc8ce..ca741fb6 100644 --- a/pacman/makepkg.conf +++ b/pacman/makepkg.conf @@ -26,13 +26,6 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % CARCH="@CARCH@" CHOST="@CHOST@" -######################################################################### -# Mingw toolchains stuff -######################################################################### -# -MINGW_CHOST="@MINGW_CHOST@" -MINGW_PREFIX="@MINGW_PREFIX@" - #-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family @@ -43,8 +36,8 @@ LDFLAGS="-pipe" #-- Make Flags: change this for DistCC/SMP systems MAKEFLAGS="-j3" #-- Debugging flags -DEBUG_CFLAGS="-g" -DEBUG_CXXFLAGS="-g" +DEBUG_CFLAGS="-ggdb -Og" +DEBUG_CXXFLAGS="-ggdb -Og" ######################################################################### # BUILD ENVIRONMENT diff --git a/pacman/makepkg_mingw32.conf b/pacman/makepkg_mingw32.conf index 08c5c9b4..4cab94c9 100644 --- a/pacman/makepkg_mingw32.conf +++ b/pacman/makepkg_mingw32.conf @@ -43,8 +43,8 @@ LDFLAGS="-pipe -L${MINGW_PREFIX}/lib" #-- Make Flags: change this for DistCC/SMP systems MAKEFLAGS="-j3" #-- Debugging flags -DEBUG_CFLAGS="-g" -DEBUG_CXXFLAGS="-g" +DEBUG_CFLAGS="-ggdb -Og" +DEBUG_CXXFLAGS="-ggdb -Og" ######################################################################### # BUILD ENVIRONMENT @@ -97,11 +97,11 @@ STRIP_SHARED="--strip-unneeded" #-- Options to be used when stripping static libraries. See `man strip' for details. STRIP_STATIC="--strip-debug" #-- Manual (man and info) directories to compress (if zipman is specified) -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info} mingw{32,64}{,/local}{,/share},opt/*}/{man,info}) +MAN_DIRS=(mingw32{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} mingw{32,64}/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +DOC_DIRS=(mingw32/{,local/}{,share/}{doc,gtk-doc}) #-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir mingw{32,64}/{,share}/info/dir .packlist *.pod) +PURGE_TARGETS=(mingw32/{,share}/info/dir .packlist *.pod) ######################################################################### # PACKAGE OUTPUT diff --git a/pacman/makepkg_mingw64.conf b/pacman/makepkg_mingw64.conf index 543a8601..c8a1ab48 100644 --- a/pacman/makepkg_mingw64.conf +++ b/pacman/makepkg_mingw64.conf @@ -43,8 +43,8 @@ LDFLAGS="-pipe -L${MINGW_PREFIX}/lib" #-- Make Flags: change this for DistCC/SMP systems MAKEFLAGS="-j3" #-- Debugging flags -DEBUG_CFLAGS="-g" -DEBUG_CXXFLAGS="-g" +DEBUG_CFLAGS="-ggdb -Og" +DEBUG_CXXFLAGS="-ggdb -Og" ######################################################################### # BUILD ENVIRONMENT @@ -97,11 +97,11 @@ STRIP_SHARED="--strip-unneeded" #-- Options to be used when stripping static libraries. See `man strip' for details. STRIP_STATIC="--strip-debug" #-- Manual (man and info) directories to compress (if zipman is specified) -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info} mingw{32,64}{,/local}{,/share},opt/*}/{man,info}) +MAN_DIRS=(mingw64{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} mingw{32,64}/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +DOC_DIRS=(mingw64/{,local/}{,share/}{doc,gtk-doc}) #-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir mingw{32,64}/{,share}/info/dir .packlist *.pod) +PURGE_TARGETS=(mingw64/{,share}/info/dir .packlist *.pod) ######################################################################### # PACKAGE OUTPUT diff --git a/perl/perlrebase b/perl/perlrebase old mode 100644 new mode 100755 index 6be7bc0e..2772fea1 --- a/perl/perlrebase +++ b/perl/perlrebase @@ -7,7 +7,7 @@ # perlrebase starts afresh all perl DLLs from a pretty low base upwards. suff=$1 -suff=${suff:=5.18.0} +suff=${suff:=5.18.1} baseaddr=$2 # use a rather low base and go upwards, might clash with some Win7 system dlls baseaddr=${baseaddr:=0x58000000}