summaryrefslogtreecommitdiff
path: root/sysutils/gdisk/files/patch-Makefile.freebsd
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/gdisk/files/patch-Makefile.freebsd')
-rw-r--r--sysutils/gdisk/files/patch-Makefile.freebsd35
1 files changed, 31 insertions, 4 deletions
diff --git a/sysutils/gdisk/files/patch-Makefile.freebsd b/sysutils/gdisk/files/patch-Makefile.freebsd
index 6bab95cebbfb..6090f056575e 100644
--- a/sysutils/gdisk/files/patch-Makefile.freebsd
+++ b/sysutils/gdisk/files/patch-Makefile.freebsd
@@ -1,10 +1,37 @@
--- Makefile.freebsd 2011-09-11 00:51:13.000000000 +0000
-+++ Makefile.freebsd 2011-09-18 20:22:41.000000000 +0000
-@@ -1,5 +1,5 @@
++++ Makefile.freebsd 2015-01-22 02:35:12.000000000 -0700
+@@ -1,8 +1,8 @@
-CC=gcc
-CXX=g++
+CC?=gcc
+CXX?=g++
CFLAGS+=-D_FILE_OFFSET_BITS=64
- CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include
- #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include
+ #CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -D USE_UTF16 -I/usr/local/include
+-CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include
++CXXFLAGS+=-Wall -D_FILE_OFFSET_BITS=64 ${CPPFLAGS}
+ 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
+@@ -15,18 +15,18 @@
+
+ gdisk: $(LIB_OBJS) gdisk.o gpttext.o
+ # $(CXX) $(LIB_OBJS) gdisk.o gpttext.o -L/usr/local/lib $(LDFLAGS) -licuio -luuid -o gdisk
+- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o -L/usr/local/lib $(LDFLAGS) -luuid -o gdisk
++ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk
+
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+ # $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/local/lib $(LDFLAGS) -licuio -luuid -lncurses -o cgdisk
+- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/local/lib $(LDFLAGS) -luuid -lncurses -o cgdisk
++ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncurses -o cgdisk
+
+ sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o
+ # $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o -L/usr/local/lib $(LDFLAGS) -luuid -licuio -lpopt -o sgdisk
+- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o -L/usr/local/lib $(LDFLAGS) -luuid -lpopt -o sgdisk
++ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk
+
+ fixparts: $(MBR_LIB_OBJS) fixparts.o
+- $(CXX) $(MBR_LIB_OBJS) fixparts.o -L/usr/local/lib $(LDFLAGS) -o fixparts
++ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts
+
+ lint: #no pre-reqs
+ lint $(SRCS)