topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- gptfdisk: update build

master
vanhofen 6 years ago
parent
fdf2e4e4a1
commit
6a97a76ebd
2 changed files with 34 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      make/system-tools.mk
  2. 31
      patches/gptfdisk-ldlibs.patch

3
make/system-tools.mk
View File

@ -1495,10 +1495,13 @@ GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz
$(ARCHIVE)/$(GPTFDISK_SOURCE): $(ARCHIVE)/$(GPTFDISK_SOURCE):
$(WGET) http://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER)/$(GPTFDISK_SOURCE) $(WGET) http://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER)/$(GPTFDISK_SOURCE)
GPTFDISK_PATCH = gptfdisk-ldlibs.patch
$(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
$(REMOVE)/gptfdisk-$(GPTFDISK_VER) $(REMOVE)/gptfdisk-$(GPTFDISK_VER)
$(UNTAR)/$(GPTFDISK_SOURCE) $(UNTAR)/$(GPTFDISK_SOURCE)
$(CHDIR)/gptfdisk-$(GPTFDISK_VER); \ $(CHDIR)/gptfdisk-$(GPTFDISK_VER); \
$(call apply_patches, $(GPTFDISK_PATCH)); \
sed -i 's|^CC=.*|CC=$(TARGET)-gcc|' Makefile; \ sed -i 's|^CC=.*|CC=$(TARGET)-gcc|' Makefile; \
sed -i 's|^CXX=.*|CXX=$(TARGET)-g++|' Makefile; \ sed -i 's|^CXX=.*|CXX=$(TARGET)-g++|' Makefile; \
$(BUILDENV) \ $(BUILDENV) \

31
patches/gptfdisk-ldlibs.patch
View File

@ -0,0 +1,31 @@
Add $(LDLIBS) support to enable clean static builds (for libintl).
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
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
@@ -12,19 +12,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
test:
./gdisk_test.sh
Write Preview
Loading…
Cancel
Save