| 1 |
commit: 8061d6bedd5012ffc6820606c26f30f97cd1bd8f |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 31 11:11:56 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 31 11:11:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8061d6be |
| 7 |
|
| 8 |
app-admin/cygwin-rebase: add support for x86-cygwin, thanks dreamcaster23 |
| 9 |
|
| 10 |
As reported via prefix <AT> g.o, i386 target works well. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild | 6 +++++- |
| 16 |
app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild | 6 +++++- |
| 17 |
2 files changed, 10 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild |
| 20 |
index 9575601c7c8..f80b7c07b4d 100644 |
| 21 |
--- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild |
| 22 |
+++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild |
| 23 |
@@ -31,7 +31,7 @@ else |
| 24 |
https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch |
| 25 |
" |
| 26 |
PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" ) |
| 27 |
- KEYWORDS="-* ~x64-cygwin" |
| 28 |
+ KEYWORDS="-* ~x64-cygwin ~x86-cygwin" |
| 29 |
fi |
| 30 |
|
| 31 |
DEPEND="" |
| 32 |
@@ -60,6 +60,10 @@ pkg_preinst() { |
| 33 |
local rebasedb |
| 34 |
local baseaddr |
| 35 |
case ${CHOST} in |
| 36 |
+ i686-*-cygwin*) |
| 37 |
+ rebasedb=/etc/rebase.db.i386 |
| 38 |
+ baseaddr=0x70000000 |
| 39 |
+ ;; |
| 40 |
x86_64-*-cygwin*) |
| 41 |
rebasedb=/etc/rebase.db.x86_64 |
| 42 |
baseaddr=0x1000000000 |
| 43 |
|
| 44 |
diff --git a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild |
| 45 |
index 9575601c7c8..f80b7c07b4d 100644 |
| 46 |
--- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild |
| 47 |
+++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild |
| 48 |
@@ -31,7 +31,7 @@ else |
| 49 |
https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch |
| 50 |
" |
| 51 |
PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" ) |
| 52 |
- KEYWORDS="-* ~x64-cygwin" |
| 53 |
+ KEYWORDS="-* ~x64-cygwin ~x86-cygwin" |
| 54 |
fi |
| 55 |
|
| 56 |
DEPEND="" |
| 57 |
@@ -60,6 +60,10 @@ pkg_preinst() { |
| 58 |
local rebasedb |
| 59 |
local baseaddr |
| 60 |
case ${CHOST} in |
| 61 |
+ i686-*-cygwin*) |
| 62 |
+ rebasedb=/etc/rebase.db.i386 |
| 63 |
+ baseaddr=0x70000000 |
| 64 |
+ ;; |
| 65 |
x86_64-*-cygwin*) |
| 66 |
rebasedb=/etc/rebase.db.x86_64 |
| 67 |
baseaddr=0x1000000000 |
Archives