Author: sparky Date: Mon Nov 13 20:38:06 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix build with multiword $(CC) - UCFLAGS before objects
---- Files affected: SOURCES: unionfs-build.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: SOURCES/unionfs-build.patch diff -u SOURCES/unionfs-build.patch:1.2 SOURCES/unionfs-build.patch:1.3 --- SOURCES/unionfs-build.patch:1.2 Sun Jan 29 00:23:50 2006 +++ SOURCES/unionfs-build.patch Mon Nov 13 21:38:01 2006 @@ -1,16 +1,16 @@ -diff -urN unionfs-1.1.2.org/Makefile unionfs-1.1.2/Makefile ---- unionfs-1.1.2.org/Makefile 2006-01-25 22:58:11.000000000 +0100 -+++ unionfs-1.1.2/Makefile 2006-01-29 00:23:36.229374500 +0100 -@@ -12,7 +12,7 @@ - VERSION = 1.1.2 +diff -Nur unionfs-1.3.orig/Makefile unionfs-1.3.build/Makefile +--- unionfs-1.3.orig/Makefile 2006-06-26 19:46:44.000000000 +0000 ++++ unionfs-1.3.build/Makefile 2006-11-13 20:35:25.000000000 +0000 +@@ -16,7 +16,7 @@ + SUP_EXTRA= TAROPTS = czvf COMPEXT = .gz -UNIONFS_DEBUG_CFLAG = -g +UNIONFS_DEBUG_CFLAG = UNIONFS_OPT_CFLAG= -O2 - UNIONFS_VERSION_CFLAG=-DUNIONFS_VERSION=\"${VERSION}\" + UNIONFS_VERSION_CFLAG=-DUNIONFS_VERSION=\"${VERSION}\" -DSUP_MAJOR=${SUP_MAJOR} -DSUP_MINOR=${SUP_MINOR} -DSUP_PATCH=${SUP_PATCH} -@@ -29,8 +29,8 @@ +@@ -33,8 +33,8 @@ CC = gcc KERNELVERSION=$(shell echo $(KVERS) | cut -d. -f1,2) @@ -21,3 +21,32 @@ obj-m := unionfs.o unionfs-objs := subr.o dentry.o file.o inode.o main.o super.o \ +@@ -84,7 +84,7 @@ + ${unionfs-objs}: unionfs.h + + utils: FRC +- make -C utils all CC=${CC} UCFLAGS='-I.. ${UCFLAGS}' ++ make -C utils all CC='${CC}' UCFLAGS='-I.. ${UCFLAGS}' + + install-utils: utils + make -C utils install PREFIX=${PREFIX} +diff -Nur unionfs-1.3.orig/utils/Makefile unionfs-1.3.build/utils/Makefile +--- unionfs-1.3.orig/utils/Makefile 2006-06-26 19:46:45.000000000 +0000 ++++ unionfs-1.3.build/utils/Makefile 2006-11-13 20:35:59.000000000 +0000 +@@ -4,13 +4,13 @@ + all: ${BINS} + + unionctl: unionctl.c usercommon.c +- ${CC} -o $@ $^ ${UCFLAGS} ++ ${CC} ${UCFLAGS} -o $@ $^ + + uniondbg: uniondbg.c +- ${CC} -o $@ $^ ${UCFLAGS} ++ ${CC} ${UCFLAGS} -o $@ $^ + + unionimap: unionimap.c usercommon.c +- ${CC} -o $@ $^ -luuid ${UCFLAGS} ++ ${CC} ${UCFLAGS} -o $@ $^ -luuid + + TAGS: $(wildcard *.[ch]) + etags -t $^ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/unionfs-build.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit