summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Krylov (philkrylov) <phil.krylov@gmail.com>2009-03-08 23:16:12 +0000
committerPhil Krylov (philkrylov) <phil.krylov@gmail.com>2009-03-08 23:16:12 +0000
commite0d9ea068c857495d41ed1c25323e701f97894df (patch)
tree44d58cf24cff2889f15023d3efe2487323351009 /dev-lang
parentmedia-gfx/synfig: whitespace (diff)
downloadsunrise-e0d9ea068c857495d41ed1c25323e701f97894df.tar.gz
sunrise-e0d9ea068c857495d41ed1c25323e701f97894df.tar.bz2
sunrise-e0d9ea068c857495d41ed1c25323e701f97894df.zip
dev-lang/xharbour: Fixed tc-getCC usage and a typo in ChangeLog.
svn path=/sunrise/; revision=8032
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/xharbour/ChangeLog6
-rw-r--r--dev-lang/xharbour/Manifest6
-rw-r--r--dev-lang/xharbour/big.diff43
-rw-r--r--dev-lang/xharbour/files/xharbour-override-cc.patch16
-rw-r--r--dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild4
5 files changed, 71 insertions, 4 deletions
diff --git a/dev-lang/xharbour/ChangeLog b/dev-lang/xharbour/ChangeLog
index f05da483f..c22613051 100644
--- a/dev-lang/xharbour/ChangeLog
+++ b/dev-lang/xharbour/ChangeLog
@@ -2,9 +2,13 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Mar 2009; Phil Krylov (philkrylov) <phil.krylov@gmail.com>
+ xharbour-1.0.0_beta1.ebuild, +big.diff, +files/xharbour-override-cc.patch:
+ Fixed tc-getCC usage and a typo in ChangeLog.
+
08 Mar 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
xharbour-1.0.0_beta1.ebuild:
- Add missing eclass, drop useless DEP, use tc-getCC for compiler, use dodoc,
+ Add missing eclass, drop useless DEP, use tc-getCC for compiler, use doins,
whitespace
08 Mar 2009; Phil Krylov (philkrylov) <phil.krylov@gmail.com>
diff --git a/dev-lang/xharbour/Manifest b/dev-lang/xharbour/Manifest
index c6d8e63d0..8a7d401bd 100644
--- a/dev-lang/xharbour/Manifest
+++ b/dev-lang/xharbour/Manifest
@@ -1,9 +1,11 @@
AUX xharbour-as-needed.patch 5807 RMD160 e4a44c1b1da169142e69cb31dbe5b677d5fd8b6e SHA1 fb095344e7d79bbf2deeb167745c1b11d7a88f72 SHA256 6704203fb9449f7a55a14f82b7141a2a9049969f5729b1c23a14ef8ee9655d05
AUX xharbour-fPIC.patch 942 RMD160 e82e793b6de7314e8da3cda111aa63e5ce13598e SHA1 fc56c72b607f63ed9e09cbff799d22b6f1170952 SHA256 7e6998d863950c0a2bf0f80ea9b031a7c3db81b6bbf311aad367762ad1a2e04b
AUX xharbour-mkinstdir.patch 386 RMD160 b36d7e51971926063eee2386a457f45b416b85f6 SHA1 668500f4f160e667b55be2a0b8d9ad2bf471e6f4 SHA256 caef1428aa93c7e17460ef71016a599f31680b327cb448716c860f094b045f44
+AUX xharbour-override-cc.patch 386 RMD160 99adb22b936e79bc248a191fe5faf2a1efcda842 SHA1 6b4e6b65b47b99db986408428e507f8c0969789f SHA256 34ff14823b720241cfcae5e99cadc834d8c6da21155f9134979d15e13ac62969
AUX xharbour-parallel-make.patch 3736 RMD160 3c4d3986a912c463b4c4dbfd73d79cea96e84c6b SHA1 e4c7c34e04db45fadc7a45904a448b01bbe47d60 SHA256 b57b85917a0d962fea6ccc8d938318bce436dff62ec2081795f50c97935390b5
AUX xharbour-skip-static-utils.patch 256 RMD160 afd46e6127a2bbcae080c14edfe5e833933b614c SHA1 17e4951348de79196138d199e7df5c8704df370c SHA256 4a0b6792b3126ff8fc24e00ebd15ea77de12542476d5990d3298f356e607d2a9
DIST xharbour-1.0.0-beta1.src.tar.gz 4599382 RMD160 201c45aee776efbd41da5c4bd7c2cb7637c78f48 SHA1 b874ec86a265ad80263c400f0e72516082747719 SHA256 0ec6faf77be2a3842465e6dc1337c760331152fbe1f9f2f95c18e59823cd3e66
-EBUILD xharbour-1.0.0_beta1.ebuild 2899 RMD160 3a1dd045a7d5bd7edcc23d30ddf8aac3d92a4643 SHA1 5ff6708a2140f0e5805c269cb73d91a419991b78 SHA256 ccb7ac795bd5e0f3298ab4d9410b32602a0688ef873ce4b74dd2375a0e44396a
-MISC ChangeLog 709 RMD160 0e8a2d234d9453837ad62be449155cdf6c15076b SHA1 cdde71eab401f5eb1a86bed0a675b0a98771358e SHA256 8b2c4c751ab687fd93148df0c72a59eeb69018d045a9591d6f7c491f31bef312
+EBUILD xharbour-1.0.0_beta1.ebuild 2955 RMD160 61916bcc6a448336bfa1501a9c2ae44a589ee73b SHA1 b7f487b0b584487eecb249f6c39e61aa942dacd5 SHA256 413daa4ae87c4b566179552363c4b3845c415046e187660dfbbc6d03584c8e5b
+MISC ChangeLog 899 RMD160 8e2bf6ecdf5c71146504a37e21c61f642939b3ef SHA1 6cae796210a05b4d0304c6715191d59d3e8b0960 SHA256 63bf735bf2ce9cb8931d899b47c4e2a994b8400a4dd0b4a62d64f46fb84572d0
+MISC big.diff 1448 RMD160 c4ff591839e00efe2c3cc1deed77e2e3e657cd63 SHA1 bf10d77b1eea7c95ab39c949a8f3050576229d49 SHA256 613d19ac0717969e1f4bc6332e566cc04ac3c0d1c9deb8c175d10515995bd818
MISC metadata.xml 243 RMD160 acce2888cb02b47c1948846ff447513f4cb6283e SHA1 8666a3eb22d98103aa8ac03907b85906e143e2cf SHA256 4b6fe2a2b60f72ca8aa59e7e0208c01e802058d5cd2ce1f3609f8bae5320d29c
diff --git a/dev-lang/xharbour/big.diff b/dev-lang/xharbour/big.diff
new file mode 100644
index 000000000..ee082fae6
--- /dev/null
+++ b/dev-lang/xharbour/big.diff
@@ -0,0 +1,43 @@
+Index: files/xharbour-override-cc.patch
+===================================================================
+--- files/xharbour-override-cc.patch (revision 0)
++++ files/xharbour-override-cc.patch (revision 0)
+@@ -0,0 +1,16 @@
++--- xharbour-1.0.0-beta1/config/linux/gcc.cf.orig2 2009-03-09 01:57:04.000000000 +0300
+++++ xharbour-1.0.0-beta1/config/linux/gcc.cf 2009-03-09 01:59:07.000000000 +0300
++@@ -4,11 +4,13 @@
++
++ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
++
+++ifeq ($(HB_CMP),)
++ ifeq ($(HB_COMPILER),gpp)
++ HB_CMP = g++
++ else
++ HB_CMP = $(HB_COMPILER)
++ endif
+++endif
++
++ OBJ_EXT = .o
++ EXE_EXT =
+Index: xharbour-1.0.0_beta1.ebuild
+===================================================================
+--- xharbour-1.0.0_beta1.ebuild (revision 8031)
++++ xharbour-1.0.0_beta1.ebuild (working copy)
+@@ -34,6 +34,7 @@
+ "${FILESDIR}"/${PN}-as-needed.patch
+ "${FILESDIR}"/${PN}-fPIC.patch
+ "${FILESDIR}"/${PN}-mkinstdir.patch
++ "${FILESDIR}"/${PN}-override-cc.patch
+ "${FILESDIR}"/${PN}-parallel-make.patch
+ "${FILESDIR}"/${PN}-skip-static-utils.patch
+ )
+@@ -48,7 +49,8 @@
+ HB_WITHOUT_GTSLN=$(useq slang || echo yes) \
+ HB_MT=$(useq threads && echo MT) \
+ HB_WITHOUT_X11=$(useq X || echo yes) \
+- HB_COMPILER="$(tc-getCC)" \
++ HB_COMPILER="gcc" \
++ HB_CMP="$(tc-getCC)" \
+ HB_ARCHITECTURE="$(uname -s | sed -e 's/-//g;y/BDFHLNOPSUX/bdfhlnopsux/;s/.*bsd/bsd/')" \
+ HB_GT_LIB="gtstd" \
+ HB_MULTI_GT="yes" \
diff --git a/dev-lang/xharbour/files/xharbour-override-cc.patch b/dev-lang/xharbour/files/xharbour-override-cc.patch
new file mode 100644
index 000000000..40c82ed97
--- /dev/null
+++ b/dev-lang/xharbour/files/xharbour-override-cc.patch
@@ -0,0 +1,16 @@
+--- xharbour-1.0.0-beta1/config/linux/gcc.cf.orig2 2009-03-09 01:57:04.000000000 +0300
++++ xharbour-1.0.0-beta1/config/linux/gcc.cf 2009-03-09 01:59:07.000000000 +0300
+@@ -4,11 +4,13 @@
+
+ include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
+
++ifeq ($(HB_CMP),)
+ ifeq ($(HB_COMPILER),gpp)
+ HB_CMP = g++
+ else
+ HB_CMP = $(HB_COMPILER)
+ endif
++endif
+
+ OBJ_EXT = .o
+ EXE_EXT =
diff --git a/dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild b/dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild
index 2cebd62f9..3696711de 100644
--- a/dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild
+++ b/dev-lang/xharbour/xharbour-1.0.0_beta1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-as-needed.patch
"${FILESDIR}"/${PN}-fPIC.patch
"${FILESDIR}"/${PN}-mkinstdir.patch
+ "${FILESDIR}"/${PN}-override-cc.patch
"${FILESDIR}"/${PN}-parallel-make.patch
"${FILESDIR}"/${PN}-skip-static-utils.patch
)
@@ -48,7 +49,8 @@ src_compile() {
HB_WITHOUT_GTSLN=$(useq slang || echo yes) \
HB_MT=$(useq threads && echo MT) \
HB_WITHOUT_X11=$(useq X || echo yes) \
- HB_COMPILER="$(tc-getCC)" \
+ HB_COMPILER="gcc" \
+ HB_CMP="$(tc-getCC)" \
HB_ARCHITECTURE="$(uname -s | sed -e 's/-//g;y/BDFHLNOPSUX/bdfhlnopsux/;s/.*bsd/bsd/')" \
HB_GT_LIB="gtstd" \
HB_MULTI_GT="yes" \