Author: bdubbs Date: Sun Mar 10 10:42:34 2013 New Revision: 2617 Log: Update gptfdisk patch for version 0.8.6
Added: trunk/gptfdisk/gptfdisk-0.8.6-convenience-1.patch Added: trunk/gptfdisk/gptfdisk-0.8.6-convenience-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gptfdisk/gptfdisk-0.8.6-convenience-1.patch Sun Mar 10 10:42:34 2013 (r2617) @@ -0,0 +1,77 @@ +Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> +Date: 2013-03-10 +Initial Package Version: 0.8.6 +Upstream Status: None. BLFS specific. +Origin: BLFS +Description: Updates Makefile enabling parameter passing. + +diff -Naur gptfdisk-0.8.5/Makefile gptfdisk-0.8.5-test/Makefile +--- gptfdisk-0.8.5/Makefile 2012-05-30 15:38:43.000000000 +0000 ++++ gptfdisk-0.8.5-test/Makefile 2013-01-01 18:40:37.000000000 +0000 +@@ -1,33 +1,48 @@ +-CC=gcc +-CXX=g++ +-CFLAGS+=-D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 +-#CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 +-LDFLAGS+= +-LIB_NAMES=crc32 support guid gptpart mbrpart basicmbr mbr gpt bsd parttypes attributes diskio diskio-unix +-MBR_LIBS=support diskio diskio-unix basicmbr mbrpart +-LIB_OBJS=$(LIB_NAMES:=.o) +-MBR_LIB_OBJS=$(MBR_LIBS:=.o) +-LIB_HEADERS=$(LIB_NAMES:=.h) +-DEPEND= makedepend $(CXXFLAGS) ++ifdef ICU ++ USE_ICU = -DUSE_UTF16 ++ EXTRA_LIBS = -licuio -licuuc ++endif ++ ++ifdef POPT ++ EXTRA_LIBS += -lpopt ++ SGDISK = sgdisk ++endif ++ ++CC = gcc ++CXX = g++ ++CFLAGS += -D_FILE_OFFSET_BITS=64 ++CXXFLAGS += -Wall -D_FILE_OFFSET_BITS=64 $(USE_ICU) ++ ++LDFLAGS += ++LIB_NAMES = crc32 support guid gptpart mbrpart basicmbr mbr \ ++ gpt bsd parttypes attributes diskio diskio-unix ++LIB_OBJS = $(LIB_NAMES:=.o) ++LIB_HEADERS = $(LIB_NAMES:=.h) + +-all: cgdisk gdisk sgdisk fixparts ++MBR_LIBS = support diskio diskio-unix basicmbr mbrpart ++MBR_LIB_OBJS = $(MBR_LIBS:=.o) ++ ++DEPEND = makedepend $(CXXFLAGS) ++ ++all: cgdisk gdisk fixparts $(SGDISK) + + 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) -licuio -licuuc -luuid -o gdisk ++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) $(EXTRA_LIBS) -luuid -o gdisk + + cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o +-# $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk +- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk ++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) $(EXTRA_LIBS) -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) -licuio -licuuc -luuid -lpopt -o sgdisk ++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) $(EXTRA_LIBS) -luuid -o sgdisk + + fixparts: $(MBR_LIB_OBJS) fixparts.o + $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts + ++install: all ++ mkdir -p $(DESTDIR)/sbin $(DESTDIR)/usr/share/man/man8 ++ cp gdisk cgdisk fixparts $(SGDISK) $(DESTDIR)/sbin ++ cp *.8 $(DESTDIR)/usr/share/man/man8 ++ + lint: #no pre-reqs + lint $(SRCS) -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
