[ignition-devel] r472 - in hamsterrific-overlay/trunk/app-pda/libirecovery: . files

Author: ziggythehamster
Date: 2011-01-20 11:55:22 -0600 (Thu, 20 Jan 2011)
New Revision: 472

Added:
   hamsterrific-overlay/trunk/app-pda/libirecovery/files/
   hamsterrific-overlay/trunk/app-pda/libirecovery/files/makefile.patch
Modified:
   hamsterrific-overlay/trunk/app-pda/libirecovery/Manifest
   hamsterrific-overlay/trunk/app-pda/libirecovery/libirecovery-9999.ebuild
Log:
Patch the makefile to make it compile the .so file and also make it -fPIC

Modified: hamsterrific-overlay/trunk/app-pda/libirecovery/Manifest
===================================================================
--- hamsterrific-overlay/trunk/app-pda/libirecovery/Manifest	2011-01-20 05:55:20 UTC (rev 471)
+++ hamsterrific-overlay/trunk/app-pda/libirecovery/Manifest	2011-01-20 17:55:22 UTC (rev 472)
@@ -1 +1,2 @@
-EBUILD libirecovery-9999.ebuild 824 RMD160 e90108191c273b02c866db1eca6dcb8c53b7f1f0 SHA1 8dc4072c0d9655d5fd4effad4db12199381eb17a SHA256 2fa05f937bbd6b8f0bd729f8990ddaa6b1371670a97ef5b76385603843c11379
+AUX makefile.patch 2564 RMD160 13bc8fc9debcced08a46a1a9f72ae4a61a1e37c1 SHA1 40b0492d6af37496fd311e571e408c4a61d03442 SHA256 05f28d3f6db60832cd05424516b20571df925096bdcf6a15d563bdd13f27b5d3
+EBUILD libirecovery-9999.ebuild 857 RMD160 7fca872b15dc3988144b48915fe7005dbf385970 SHA1 03c4440eb6c6be1f278d505f34e309742f002f7c SHA256 360fcc10b025ee9f349f1eaba4397cd3044329244ee095b863e18f80e2b56f90

Added: hamsterrific-overlay/trunk/app-pda/libirecovery/files/makefile.patch
===================================================================
--- hamsterrific-overlay/trunk/app-pda/libirecovery/files/makefile.patch	                        (rev 0)
+++ hamsterrific-overlay/trunk/app-pda/libirecovery/files/makefile.patch	2011-01-20 17:55:22 UTC (rev 472)
@@ -0,0 +1,68 @@
+--- Makefile.orig	2011-01-20 11:35:38.011145483 -0600
++++ Makefile	2011-01-20 11:50:49.906137599 -0600
+@@ -50,26 +50,26 @@
+ 		LIBIRECOVERY_SHARED_LDFLAGS = $(LDFLAGS)
+ 		LIBIRECOVERY_SHARED_LIBS = $(LIBS)
+ 	else
+-		CFLAGS = -O3 -I./include -I/usr/include -I/usr/local/include
+-		LDFLAGS = -L/usr/lib -L/usr/local/lib
++		PKG_CFLAGS = $(CFLAGS) -fPIC -I./include -I/usr/include
++		PKG_LDFLAGS = $(LDFLAGS)
+ 		LIBS = -lusb-1.0 -lreadline
+ 		
+ 		IRECOVERY_TARGET = irecovery
+ 		IRECOVERY_OBJECTS = irecovery.o
+-		IRECOVERY_CFLAGS = $(CFLAGS)
+-		IRECOVERY_LDFLAGS = $(LDFLAGS)
++		IRECOVERY_CFLAGS = $(PKG_CFLAGS)
++		IRECOVERY_LDFLAGS = $(PKG_LDFLAGS)
+ 		IRECOVERY_LIBS = $(LIBS)
+ 	
+ 		LIBIRECOVERY_STATIC_TARGET = libirecovery.a
+ 		LIBIRECOVERY_STATIC_OBJECTS = libirecovery.o
+-		LIBIRECOVERY_STATIC_CFLAGS = $(CLFAGS)
+-		LIBIRECOVERY_STATIC_LDFLAGS = $(LDFLAGS)
++		LIBIRECOVERY_STATIC_CFLAGS = $(PKG_CLFAGS)
++		LIBIRECOVERY_STATIC_LDFLAGS = $(PKG_LDFLAGS)
+ 		LIBIRECOVERY_STATIC_LIBS = $(LIBS)
+ 	
+ 		LIBIRECOVERY_SHARED_TARGET = libirecovery.so
+ 		LIBIRECOVERY_SHARED_OBJECTS = libirecovery.o
+-		LIBIRECOVERY_SHARED_CFLAGS = $(CFLAGS)
+-		LIBIRECOVERY_SHARED_LDFLAGS = $(LDFLAGS)
++		LIBIRECOVERY_SHARED_CFLAGS = $(PKG_CFLAGS) -shared -Wl,-soname,libirecovery.so.1
++		LIBIRECOVERY_SHARED_LDFLAGS = $(PKG_LDFLAGS)
+ 		LIBIRECOVERY_SHARED_LIBS = $(LIBS)
+ 	endif
+ endif
+@@ -77,19 +77,20 @@
+ LIBIRECOVERY_OBJECTS = libirecovery.o
+ IRECOVERY_OBJECTS = irecovery.o libirecovery.a
+ 
+-TARGETS = $(LIBIRECOVERY_STATIC_TARGET) $(IRECOVERY_TARGET)
++TARGETS = $(LIBIRECOVERY_STATIC_TARGET) $(LIBIRECOVERY_SHARED_TARGET) $(IRECOVERY_TARGET)
+ OBJECTS = libirecovery.o irecovery.o
+ 
+ %.o: %.S
+-	$(CC) -c $(<) -o $(@) $(CFLAGS)
++	$(CC) -c $(<) -o $(@) $(PKG_CFLAGS)
+ 
+ %.o: %.c
+-	$(CC) -c $(<) -o $(@) $(CFLAGS) 
++	$(CC) -c $(<) -o $(@) $(PKG_CFLAGS) 
+ 
+ $(LIBIRECOVERY_STATIC_TARGET): $(LIBIRECOVERY_STATIC_OBJECTS)
+ 	$(AR) rs $(LIBIRECOVERY_STATIC_TARGET) $(LIBIRECOVERY_STATIC_OBJECTS)
+ 	
+ $(LIBIRECOVERY_SHARED_TARGET): $(LIBIRECOVERY_SHARED_OBJECTS)
++	$(CC) -o $(LIBIRECOVERY_SHARED_TARGET) $(LIBIRECOVERY_SHARED_OBJECTS) $(LIBIRECOVERY_SHARED_CFLAGS) $(LIBIRECOVERY_SHARED_LDFLAGS) $(LIBIRECOVERY_SHARED_LIBS)
+ 
+ $(IRECOVERY_TARGET): $(IRECOVERY_OBJECTS)
+ 	$(CC) -o $(IRECOVERY_TARGET) $(IRECOVERY_OBJECTS) $(IRECOVERY_CFLAGS) $(IRECOVERY_LDFLAGS) $(IRECOVERY_LIBS)
+@@ -98,4 +99,4 @@
+ 	
+ 		
+ clean:
+-	$(RM) $(LIBIRECOVERY_STATIC_TARGET) $(IRECOVERY_TARGET) *.o
+\ No newline at end of file
++	$(RM) $(LIBIRECOVERY_STATIC_TARGET) $(LIBIRECOVERY_SHARED_TARGET) $(IRECOVERY_TARGET) *.o

Modified: hamsterrific-overlay/trunk/app-pda/libirecovery/libirecovery-9999.ebuild
===================================================================
--- hamsterrific-overlay/trunk/app-pda/libirecovery/libirecovery-9999.ebuild	2011-01-20 05:55:20 UTC (rev 471)
+++ hamsterrific-overlay/trunk/app-pda/libirecovery/libirecovery-9999.ebuild	2011-01-20 17:55:22 UTC (rev 472)
@@ -20,8 +20,12 @@
         sys-libs/readline"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/makefile.patch"
+}
+
 src_compile() {
-	emake CFLAGS="-shared -fPIC" all || die "failed emake"
+	emake all || die "failed emake"
 }
 
 src_install() {