[lfs-patches] r3289 - trunk/gptfdisk

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Mon Oct 19 20:26:13 PDT 2015


Author: bdubbs
Date: Mon Oct 19 20:26:13 2015
New Revision: 3289

Log:
Add rediffed gptfdisk patch

Added:
   trunk/gptfdisk/gptfdisk-1.0.1-convenience-1.patch

Added: trunk/gptfdisk/gptfdisk-1.0.1-convenience-1.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/gptfdisk/gptfdisk-1.0.1-convenience-1.patch	Mon Oct 19 20:26:13 2015	(r3289)
@@ -0,0 +1,87 @@
+Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
+Date:                    2015-10-19
+Initial Package Version: 1.0.1
+Upstream Status:         None.  BLFS specific.
+Origin:                  BLFS
+Description:             Updates Makefile enabling parameter passing.
+                         Rediffed for version 1.0.1
+
+--- gptfdisk-1.0.1/Makefile	2015-10-18 17:35:18.000000000 -0500
++++ gptfdisk-1.0.1/Makefile.lfs	2015-10-19 22:14:05.946559778 -0500
+@@ -1,29 +1,39 @@
+-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 -lncursesw -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 -lncursesw -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 -lpopt -o sgdisk
+ 
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+ 	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
+@@ -37,6 +47,12 @@
+ clean:	#no pre-reqs
+ 	rm -f core *.o *~ gdisk sgdisk cgdisk 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
++
++
+ # what are the source dependencies
+ depend: $(SRCS)
+ 	$(DEPEND) $(SRCS)
+@@ -44,4 +60,3 @@
+ $(OBJS):
+ 	$(CRITICAL_CXX_FLAGS) 
+ 
+-# DO NOT DELETE


More information about the patches mailing list