summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Gagern (MvG) <Martin.vGagern@gmx.net>2010-07-04 21:32:13 +0000
committerMartin von Gagern (MvG) <Martin.vGagern@gmx.net>2010-07-04 21:32:13 +0000
commit5bde30a77bbbd2f2e6905d1940647836197dc674 (patch)
treef0568ee01ac7c5172eacffd34154dd12f7c379d9
parentapp-misc/cursetheweather: Fix breakage introduced by merge of the previous tw... (diff)
downloadsunrise-5bde30a77bbbd2f2e6905d1940647836197dc674.tar.gz
sunrise-5bde30a77bbbd2f2e6905d1940647836197dc674.tar.bz2
sunrise-5bde30a77bbbd2f2e6905d1940647836197dc674.zip
[dev-util/eresi-0.82_beta2] Fix problem with --as-needed
svn path=/sunrise/; revision=10891
-rw-r--r--dev-util/eresi/ChangeLog4
-rw-r--r--dev-util/eresi/Manifest5
-rw-r--r--dev-util/eresi/eresi-0.82_beta2.ebuild1
-rw-r--r--dev-util/eresi/files/0.82_beta2-as-needed.patch28
4 files changed, 36 insertions, 2 deletions
diff --git a/dev-util/eresi/ChangeLog b/dev-util/eresi/ChangeLog
index 6d2e8aa1b..18c68782e 100644
--- a/dev-util/eresi/ChangeLog
+++ b/dev-util/eresi/ChangeLog
@@ -3,6 +3,10 @@
# $Header: $
04 Jul 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+ +files/0.82_beta2-as-needed.patch, eresi-0.82_beta2.ebuild:
+ Fix problem with --as-needed
+
+ 04 Jul 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+files/0.82_beta2-drop-dprintf.patch, eresi-0.82_beta2.ebuild:
Fix build-time issue due to conflicting dprintf declarations
diff --git a/dev-util/eresi/Manifest b/dev-util/eresi/Manifest
index a1f90b547..c8fe6e9e2 100644
--- a/dev-util/eresi/Manifest
+++ b/dev-util/eresi/Manifest
@@ -1,6 +1,7 @@
+AUX 0.82_beta2-as-needed.patch 1508 RMD160 7f452532bd231fb6bd1a2aed574c50fd3969442c SHA1 053f33cc40e600185fd779e751f1f447359a9a3e SHA256 0c0fc1ba336d9d2bfd22d53a7856fe1ec79e94bb7f86785e4b8b8cca66bd665d
AUX 0.82_beta2-drop-dprintf.patch 1113 RMD160 f4f42ef7559704dd82c2700d105bc675fc805d9e SHA1 a43671d5dd40df6997c70761775f58318362340f SHA256 2d1c9b56ac33217242c50000388114e178ea359a328e33f6557cbac4332b81ea
AUX 0.82_beta2-parallel-make.patch 1970 RMD160 6b7bd0515188264a8ad8c799c6873d15b43f4332 SHA1 6e67edb49670c3c67e9df46abf5d89229ef41459 SHA256 564b6e46e10797b096d75f50691f9bf2244271fe04e4234a908dcd4f7dfade13
DIST eresi-0.82_beta2.tar.bz2 1132566 RMD160 a52cb8ae6da30dc9f2dd024e064a8da3c3666d02 SHA1 41d28e4bfc486c8f48cf15fb57e4b3f35f21a3aa SHA256 93daa8e392d33897d2fe3a9b27b198671941a53803fdb9bc08dea8a3f9b13a44
-EBUILD eresi-0.82_beta2.ebuild 2086 RMD160 9fe14c690a7046e715989ccad002c9c4025426b5 SHA1 dd836df59f2744c1fecb5cf4c59c7a6c64df094b SHA256 f42bdd07d8966df91f5de2acb485e8b7bbe520d0c5717ab47422636860a30505
-MISC ChangeLog 767 RMD160 2b026b1069bf7e7aa49c36c211345ccf95801e70 SHA1 92aec678e29959e7cb682020cc4391467e7147c8 SHA256 a4a0cba3ed0a9dd2c69d613220e87d8db2f2eec3ed746bf645f1bc003916fe6b
+EBUILD eresi-0.82_beta2.ebuild 2135 RMD160 c2be388f9f4b665d083e827683d70ea6a3f50ae4 SHA1 662b715138f46b95991b5fbc404af9e93c8ed227 SHA256 ff54b6be93982e8cea923d8638876ee43264ad7256e73d84886e383dd61a574f
+MISC ChangeLog 925 RMD160 a0c30bc03c492133daf9eacb025dc0f0175ea6f2 SHA1 3c22b77595002d7dadff8999cd0fd90f329faed6 SHA256 084990410d450834eb7dc9f5564c1c5ceef65c99424053c8046b71d9084b66d8
MISC metadata.xml 299 RMD160 c421ce3f432ded8e42ed44e567107616be910947 SHA1 d1621e3de10856ea4aa3d9a6caf1f98626a4dd5c SHA256 f2df47e8793acbc859ce7ad3775bd21be711850f3d5bde3910347b195dc46f5a
diff --git a/dev-util/eresi/eresi-0.82_beta2.ebuild b/dev-util/eresi/eresi-0.82_beta2.ebuild
index 2ec547a39..2b2825f1f 100644
--- a/dev-util/eresi/eresi-0.82_beta2.ebuild
+++ b/dev-util/eresi/eresi-0.82_beta2.ebuild
@@ -31,6 +31,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/0.82_beta2-parallel-make.patch
epatch "${FILESDIR}"/0.82_beta2-drop-dprintf.patch
+ epatch "${FILESDIR}"/0.82_beta2-as-needed.patch
sed -i \
-e 's: -O2 : :g' \
-e "s: -g3 : ${CFLAGS} :" \
diff --git a/dev-util/eresi/files/0.82_beta2-as-needed.patch b/dev-util/eresi/files/0.82_beta2-as-needed.patch
new file mode 100644
index 000000000..978bf9512
--- /dev/null
+++ b/dev-util/eresi/files/0.82_beta2-as-needed.patch
@@ -0,0 +1,28 @@
+Index: eresi-0.82_beta2/e2dbg/Makefile
+===================================================================
+--- eresi-0.82_beta2.orig/e2dbg/Makefile
++++ eresi-0.82_beta2/e2dbg/Makefile
+@@ -38,9 +38,10 @@ CFLAGS64 += -fPIC -g3 -Wall -Iinclude $
+ -DERESI64
+
+ LDFLAGS32 += -L../liballocproxy -lallocproxy -L../libelfsh/ -lelfsh32 \
+- -L../libetrace/ -letrace32 -L../libstderesi -lstderesi32 \
++ -L../libetrace/ -letrace32 \
+ -L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasm32 \
+ -L../libaspect/ -laspect32 -L../librevm/ -lrevm32 \
++ -L../libstderesi -lstderesi32 \
+ -L../libmjollnir -lmjollnir32 -g3 \
+ -L../libui/ -lui32 -L../libedfmt -ledfmt32 \
+ $(LDREADLNOPT) $(DLOPT) -L/usr/freeware/lib32/ $(DYNOPT) \
+@@ -48,9 +49,10 @@ LDFLAGS32 += -L../liballocproxy -lalloc
+ $(LDMJOLLNIR) $(KERNSHLIB32) $(NCURSESLNOPT) $(READLNOPT)
+
+ LDFLAGS64 += -L../liballocproxy -lallocproxy -L../libelfsh/ -lelfsh64 \
+- -L../libetrace/ -letrace64 -L../libstderesi -lstderesi64 \
++ -L../libetrace/ -letrace64 \
+ -L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasm64 \
+ -L../libaspect/ -laspect64 -L../librevm/ -lrevm64 \
++ -L../libstderesi -lstderesi64 \
+ -L../libmjollnir -lmjollnir64 -g3 \
+ -L../libui/ -lui64 -L../libedfmt -ledfmt64 \
+ $(LDREADLNOPT) $(DLOPT) -L/usr/freeware/lib32/ $(DYNOPT) \