gptfdisk: reinstate ldlibs support patch

PATCH New Gustavo Zacarias 2 participants 2 messages May 1, 2015

Share & tools

Gustavo Zacarias

author

2015-05-01 11:49 UTC #0 lore raw

PATCH 1/1 gptfdisk: reinstate ldlibs support patch

I removed that in fac3042cc53a9aff87cb047f55a12d23c9973f4d because the ICU part was no longer required.
However the LDLIBS part is for static builds and should have been a separate patch to avoid confusion. Fixes:
http://autobuild.buildroot.net/results/a90/a9092d01a71e2d799e5b7b3afb9fd3e304370d0c/

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/gptfdisk/0001-ldlibs.patch | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/gptfdisk/0001-ldlibs.patch

package/gptfdisk/0001-ldlibs.patch new file +31 -0

new file mode 100644
index 0000000..ca1d7fb
@@ -0,0 +1,31 @@
+Add $(LDLIBS) support to enable clean static builds (for libintl).
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura gptfdisk-0.8.10.orig/Makefile gptfdisk-0.8.10/Makefile
+--- gptfdisk-0.8.10.orig/Makefile	2015-05-01 08:45:14.667748141 -0300
++++ gptfdisk-0.8.10/Makefile	2015-05-01 08:45:42.685699419 -0300
+@@ -14,19 +14,19 @@
+ all:	cgdisk gdisk sgdisk fixparts
+ 
+ gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
+-	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
++	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid $(LDLIBS) -o gdisk
+ #	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk
+ 
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw -o cgdisk
++	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw $(LDLIBS) -o cgdisk
+ #	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk
+ 
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+-	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
++	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt $(LDLIBS) -o sgdisk
+ #	$(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk
+ 
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+-	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
++	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) $(LDLIBS) -o fixparts
+ 
+ lint:	#no pre-reqs
+ 	lint $(SRCS)

Signature · 1 line

2.0.5

Thomas Petazzoni

Applied

2015-05-01 14:23 UTC #1 lore raw

PATCH 1/1 gptfdisk: reinstate ldlibs support patch

Dear Gustavo Zacarias,

Quoted 11 lines · Gustavo Zacarias

I removed that in fac3042cc53a9aff87cb047f55a12d23c9973f4d because the ICU part was no longer required.
However the LDLIBS part is for static builds and should have been a separate patch to avoid confusion. Fixes:
http://autobuild.buildroot.net/results/a90/a9092d01a71e2d799e5b7b3afb9fd3e304370d0c/
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gptfdisk/0001-ldlibs.patch | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 package/gptfdisk/0001-ldlibs.patch

Applied, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com