rebase: Move to /usr layout
This commit is contained in:
Alexpux
parent
b5c0b13aaf
commit
f6bca50d02
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=rebase
|
||||
pkgver=4.4.1
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="The Cygwin rebase distribution contains four utilities, rebase, rebaseall, peflags, and peflagsall."
|
||||
groups=('base')
|
||||
arch=('i686' 'x86_64')
|
||||
@ -17,14 +17,16 @@ source=('rebase-4.4.1.tar.bz2'
|
||||
'autorebasebase1st.bat'
|
||||
'rebaseall-add-python-exts.patch'
|
||||
'pacman-rec-filename-grep'
|
||||
'allow-non-database-mode-when-__CYGWIN__-__MSYS__.patch')
|
||||
'allow-non-database-mode-when-__CYGWIN__-__MSYS__.patch'
|
||||
'msys2-usr.patch')
|
||||
sha1sums=('8f60d206e708b4ad77eb3223601637b5b3205021'
|
||||
'a05d023f9594a7cac160ec538f10f7ea23427331'
|
||||
'92866b5e2db0faa35dd6e04ec8140ba33d53f063'
|
||||
'e0410696a07a2aa2e71a90032e6613a6194ffa85'
|
||||
'f2ada0a753a8deef9901611ac5605613c8aafc59'
|
||||
'03f69430fba022ba968be7493705786d15ece79b'
|
||||
'a24eaaf73e92a604135ddf6169a4bcc4875b172a'
|
||||
'47efdc02e25611be06458d33098668a854f70d42')
|
||||
'47efdc02e25611be06458d33098668a854f70d42'
|
||||
'23e296154eec725f6cddb989cc6e36c9bb70c336')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
@ -32,6 +34,7 @@ prepare() {
|
||||
patch -p1 -i $srcdir/rebase-4.4.1-msys2.patch
|
||||
patch -p1 -i $srcdir/rebaseall-add-python-exts.patch
|
||||
patch -p1 -i $srcdir/allow-non-database-mode-when-__CYGWIN__-__MSYS__.patch
|
||||
patch -p1 -i $srcdir/msys2-usr.patch
|
||||
|
||||
if check_option "strip" "n"; then
|
||||
sed -i "s/ -s//g" Makefile.in
|
||||
|
||||
86
rebase/msys2-usr.patch
Normal file
86
rebase/msys2-usr.patch
Normal file
@ -0,0 +1,86 @@
|
||||
--- rebase-4.4.1-orig/rebaseall.in 2013-02-18 14:04:43.000000000 +0400
|
||||
+++ rebase-4.4.1/rebaseall.in 2014-06-24 14:32:45.015200000 +0400
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/@ASH@
|
||||
+#!/usr/bin/@ASH@
|
||||
|
||||
#
|
||||
# Copyright (c) 2003, 2005, 2006, 2008, 2011, 2012 Jason Tishler
|
||||
@@ -134,12 +134,12 @@
|
||||
ProcessResult=0
|
||||
case $Platform in
|
||||
mingw|msys )
|
||||
- /bin/ps -s | /bin/gawk '\
|
||||
+ /usr/bin/ps -s | /usr/bin/gawk '\
|
||||
# Count number of running ash or dash. \
|
||||
- /\/bin\/(d)?ash(\.exe)?$/{ ash_cnt++; } \
|
||||
+ /\/usr\/bin\/(d)?ash(\.exe)?$/{ ash_cnt++; } \
|
||||
# Count number of ps and gawk. \
|
||||
- /\/bin\/ps(\.exe)?$/{ cnt++; } \
|
||||
- /\/bin\/gawk(\.exe)?$/{ cnt++; } \
|
||||
+ /\/usr\/bin\/ps(\.exe)?$/{ cnt++; } \
|
||||
+ /\/usr\/bin\/gawk(\.exe)?$/{ cnt++; } \
|
||||
END{ \
|
||||
# Uncomment for testing: \
|
||||
# printf "TOTAL: %d CNT: %d ASH_CNT: %d\n", NR, cnt, ash_cnt; \
|
||||
@@ -165,7 +165,7 @@
|
||||
echo "${ProgramName}: only ash or dash processes are allowed during rebasing"
|
||||
echo " Exit all Cygwin processes and stop all Cygwin services."
|
||||
echo " Execute ash (or dash) from Start/Run... or a cmd or command window."
|
||||
- echo " Execute '/bin/rebaseall' from ash (or dash)."
|
||||
+ echo " Execute '/usr/bin/rebaseall' from ash (or dash)."
|
||||
exit 2
|
||||
fi
|
||||
fi
|
||||
@@ -231,7 +231,7 @@
|
||||
NoDyn='-n'
|
||||
;;
|
||||
mingw|msys)
|
||||
- for f in /bin /lib
|
||||
+ for f in /usr/bin /usr/lib
|
||||
do
|
||||
find $f -type f |
|
||||
grep -E "\.($Suffixes)\$" |
|
||||
--- rebase-4.4.1-orig/peflagsall.in 2012-04-30 17:37:15.000000000 +0400
|
||||
+++ rebase-4.4.1/peflagsall.in 2014-06-24 14:32:39.617600000 +0400
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/@ASH@
|
||||
+#!/usr/bin/@ASH@
|
||||
|
||||
#
|
||||
# Copyright (c) 2009,2011 Charles Wilson
|
||||
@@ -153,12 +153,12 @@
|
||||
ProcessResult=0
|
||||
case $Platform in
|
||||
mingw|msys )
|
||||
- /bin/ps -s | /bin/gawk '\
|
||||
+ /usr/bin/ps -s | /usr/bin/gawk '\
|
||||
# Count number of running ash or dash. \
|
||||
- /\/bin\/(d)?ash(\.exe)?$/{ ash_cnt++; } \
|
||||
+ /\/usr\/bin\/(d)?ash(\.exe)?$/{ ash_cnt++; } \
|
||||
# Count number of ps and gawk. \
|
||||
- /\/bin\/ps(\.exe)?$/{ cnt++; } \
|
||||
- /\/bin\/gawk(\.exe)?$/{ cnt++; } \
|
||||
+ /\/usr\/bin\/ps(\.exe)?$/{ cnt++; } \
|
||||
+ /\/usr\/bin\/gawk(\.exe)?$/{ cnt++; } \
|
||||
END{ \
|
||||
# Uncomment for testing: \
|
||||
# printf "TOTAL: %d CNT: %d ASH_CNT: %d\n", NR, cnt, ash_cnt; \
|
||||
@@ -184,7 +184,7 @@
|
||||
echo "$ProgramName: only ash or dash processes are allowed during this process."
|
||||
echo " Exit all Cygwin processes and stop all Cygwin services."
|
||||
echo " Execute ash (or dash) from Start/Run... or a cmd or command window."
|
||||
- echo " Execute '/bin/peflagsall' from ash (or dash)."
|
||||
+ echo " Execute '/usr/bin/peflagsall' from ash (or dash)."
|
||||
exit 2
|
||||
fi
|
||||
|
||||
@@ -264,7 +264,7 @@
|
||||
-e '/d?ash\.exe$/d' -e '/peflags\.exe$/d' >"${TmpFile}"
|
||||
;;
|
||||
msys)
|
||||
- for f in /bin /lib
|
||||
+ for f in /usr/bin /usr/lib
|
||||
do
|
||||
find $f -type f |
|
||||
grep -E "\.($Suffixes)\$" |
|
||||
@ -90,7 +90,7 @@ diff -urN rebase-4.4.1.orig/imagehelper/objectfile.cc rebase-4.4.1/imagehelper/o
|
||||
|
||||
-
|
||||
+#if defined (__MSYS__)
|
||||
+ LinkedObjectFile test("/bin/msys-z.dll");
|
||||
+ LinkedObjectFile test("/usr/bin/msys-z.dll");
|
||||
+#else
|
||||
LinkedObjectFile test("/bin/cygz.dll");
|
||||
-
|
||||
@ -182,7 +182,7 @@ diff -urN rebase-4.4.1.orig/rebase.c rebase-4.4.1/rebase.c
|
||||
- &cygwin_dll_image_base, &cygwin_dll_image_size);
|
||||
+ /* Fetch the MSYS DLLs data to make sure that DLLs aren't rebased
|
||||
+ into the memory area taken by the MSYS DLL. */
|
||||
+ GetImageInfos64 ("/bin/msys-2.0.dll", NULL,
|
||||
+ GetImageInfos64 ("/usr/bin/msys-2.0.dll", NULL,
|
||||
+ &cygwin_dll_image_base, &cygwin_dll_image_size);
|
||||
+ /* Take the up to four shared memory areas preceeding the DLL into
|
||||
+ account. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user