vbetest: Import LDFLAGS patch from lrmi.

And update the ebuild accordingly.

diff --git a/sys-apps/vbetest/Manifest b/sys-apps/vbetest/Manifest
index de672bf6ce4cc787c1915531215703c05f572cd4..8e36b00ee4f73c6ed9f9fb53554e7e11a8414a0b 100644 (file)
--- a/sys-apps/vbetest/Manifest
+++ b/sys-apps/vbetest/Manifest
@@ -1,4 +1,5 @@
-AUX vbetest-libx86.patch 666 RMD160 fd76f2a1825dc1d9c14c0db256da5c6ecd890d38 SHA1 5107f405c9b835bc419d1765b3f3b3716509e718 SHA256 78bca3120cb814f9aba09d079abe5fba673c3214e2faa3f1a748c026f7e99d4e
-AUX vbetest-sharedlrmi.patch 414 RMD160 f2be81deb3189530862898399849791a62285ec3 SHA1 9716cf9655a5b7f6c40f3a91e13216a9cca40666 SHA256 4994414af5c9aa4dfd38ea31df9676b16d6970ec5cdad73b044a637c5ab1d128
+AUX lrmi-0.10-ldflags.patch 933 RMD160 8a00795f9cd3ccdfa69604907d22f6b50c8d022a SHA1 d2c485b780cc32119c0db949fc406e9b25e2543c SHA256 43356cc620593291d8ff079d36a770440b7cfa0c2318f869928c1968c08f2075
+AUX vbetest-libx86.patch 688 RMD160 eab54699c54e8f63f56862adca592ee1c1a8a08e SHA1 34b14043e20f37bd0bd09c053851cc9721f8b1ea SHA256 6981d1513d0d50794d9de5887e2ad27ee340aed04cb65faca43b73fd49fffdf3
+AUX vbetest-sharedlrmi.patch 436 RMD160 6e91c20ffe16b12394c813eafeea80d359254bde SHA1 475c462abdfb2704a09e3da9667f195a3bdc9174 SHA256 ce4a409752e5c4e3182f156edc1cf02c84f4490a5221f134104ede54a10017db
 DIST lrmi-0.10.tar.gz 10271 RMD160 3805b41fd2a558ec145991c30a7f88101af48f1c SHA1 1495b3c2f3613979eb0396fd99a8e5e52d53ec80 SHA256 b0be55c14407f586dc10836e8f348b3a002c461a9b47a302071eac0ef85770da
-EBUILD vbetest-0.10.ebuild 636 RMD160 17f2b01229e2fb87cac212503281bb98202f8a8f SHA1 41a446ecb1bbee13ca81ef590cdadb6e2b1b6007 SHA256 5e0c423ddeb6575e72bc21d9cff5cb14882884d532b27530240a2a6149bcfaf8
+EBUILD vbetest-0.10.ebuild 690 RMD160 66e142f2a722e125b265fc0eac8f220e24de598f SHA1 9677c2e703c5dd66033af2d3bce627294ecf92cb SHA256 e608d33c443cb940745d8680c0182b6d2f1543add32ba3539c9adeccfdab5489

diff --git a/sys-apps/vbetest/files/lrmi-0.10-ldflags.patch b/sys-apps/vbetest/files/lrmi-0.10-ldflags.patch
new file mode 100644 (file)
index 0000000..39d298c
--- /dev/null
+++ b/sys-apps/vbetest/files/lrmi-0.10-ldflags.patch
@@ -0,0 +1,26 @@
+diff -Naurp lrmi-0.10-orig/Makefile lrmi-0.10/Makefile
+--- lrmi-0.10-orig/Makefile    2010-08-20 15:03:17.093144820 +0200
++++ lrmi-0.10/Makefile 2010-08-20 15:03:47.761144267 +0200
+@@ -2,6 +2,7 @@ LIBDIR ?= /usr/local/lib
+ INCDIR ?= /usr/local/include
+ 
+ CFLAGS = -g -Wall
++LDFLAGS =
+ 
+ sources = lrmi.c
+ objects = lrmi.o
+@@ -26,12 +27,12 @@ liblrmi.a: $(objects)
+ 
+ liblrmi.so: $(pic_objects)
+ #     $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $^
+-      $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^
++      $(CC) $(CPPFLAGS) $(CFLAGS) -Wl,-soname,$(LIBNAME).so.$(MAJOR) $(LDFLAGS) -fPIC -shared -o $(LIBNAME).so.$(VERSION) $^
+       ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR)
+       ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so
+ 
+ vbetest: vbetest.c liblrmi.a
+-      $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
++      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ install:
+       mkdir -p $(LIBDIR)

diff --git a/sys-apps/vbetest/files/vbetest-libx86.patch b/sys-apps/vbetest/files/vbetest-libx86.patch
index 7b18a45a9d7cbae67cd99a1d5e62cf6284ac15d1..bd03e12dc3a4574b089ea8b718a27006bb3bbc8b 100644 (file)
--- a/sys-apps/vbetest/files/vbetest-libx86.patch
+++ b/sys-apps/vbetest/files/vbetest-libx86.patch
@@ -16,9 +16,9 @@
        ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so
  
 -vbetest: vbetest.c liblrmi.a
--      $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
+-      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
 +vbetest: vbetest.c
-+      $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ -lx86
++      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lx86
  
  install:
        mkdir -p $(LIBDIR)

diff --git a/sys-apps/vbetest/files/vbetest-sharedlrmi.patch b/sys-apps/vbetest/files/vbetest-sharedlrmi.patch
index 11d3730aee9acaae0b6ee18693710804ce806031..abe8e28b46ab2b5474f40655f0f47e74a16ea335 100644 (file)
--- a/sys-apps/vbetest/files/vbetest-sharedlrmi.patch
+++ b/sys-apps/vbetest/files/vbetest-sharedlrmi.patch
@@ -5,9 +5,9 @@
        ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so
  
 -vbetest: vbetest.c liblrmi.a
--      $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
+-      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
 +vbetest: vbetest.c
-+      $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ -llrmi
++      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -llrmi
  
  install:
        mkdir -p $(LIBDIR)

diff --git a/sys-apps/vbetest/vbetest-0.10.ebuild b/sys-apps/vbetest/vbetest-0.10.ebuild
index a589c22c820f12eafd2e28b0b8acb5d092333d83..566fc4ccd979099d6119c53394fd298f822b370f 100644 (file)
--- a/sys-apps/vbetest/vbetest-0.10.ebuild
+++ b/sys-apps/vbetest/vbetest-0.10.ebuild
@@ -17,15 +17,16 @@ DEPEND="lrmi? ( =sys-libs/lrmi-${PV}* )
        !lrmi? ( dev-libs/libx86 )"
 
 src_prepare() {
+       epatch "${FILESDIR}/lrmi-${PV}-ldflags.patch"
        if ! use lrmi ; then
-               epatch "${FILESDIR}/${PN}-libx86.patch" || die
+               epatch "${FILESDIR}/${PN}-libx86.patch"
        else
-               epatch "${FILESDIR}/${PN}-sharedlrmi.patch" || die
+               epatch "${FILESDIR}/${PN}-sharedlrmi.patch"
        fi
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" vbetest
+       emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" vbetest
 }
 
 src_install() {