diff options
Diffstat (limited to 'app-admin/fsvs/files')
-rw-r--r-- | app-admin/fsvs/files/fsvs-1.2.11-makefile.patch | 68 | ||||
-rw-r--r-- | app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch | 31 |
2 files changed, 68 insertions, 31 deletions
diff --git a/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch new file mode 100644 index 000000000000..93daf9521d3e --- /dev/null +++ b/app-admin/fsvs/files/fsvs-1.2.11-makefile.patch @@ -0,0 +1,68 @@ +--- a/Makefile ++++ b/Makefile +@@ -13,7 +13,7 @@ + @echo '' + @false + +-configure: configure.in ++configure: configure.ac + @echo Generating configure. + autoconf + +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -11,10 +11,11 @@ + ################################ Definitions ################################ + DIR := /usr/share/doc + +-VERSION := $(shell git describe --tags --always) ++VERSION := 1.2.11 + ++CC := @CC@ + CFLAGS := @CFLAGS@ +-CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations ++CFLAGS += -Wall -funsigned-char -DFSVS_VERSION='"$(VERSION)"' -Wno-deprecated-declarations + LDFLAGS := @LDFLAGS@ + FSVS_LDFLAGS = $(LDFLAGS) + BASELIBS := -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre2-8 -lgdbm -ldl +@@ -48,11 +49,7 @@ + + + ################################ Targets ################################### +-ifeq (@CHROOTER_JAIL@, ) +-all: deps tags check-version check-dox $(DEST) lsDEST +-else +-all: tools/fsvs-chrooter +-endif ++all: fsvs + + + check-version: config.h fsvs.c +@@ -145,18 +142,11 @@ + + + ################################ Rules ###################################### +-%.o: %.c +- @echo " CC $<" +- @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + + # if the Makefile has changed, the output will (at least sometimes) + # change, too. + $(DEST): $(C_FILES:%.c=%.o) +- @echo " Link $@" +- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) +-ifeq (@ENABLE_RELEASE@, 1) +- -strip $@ +-endif ++ $(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) -o $@ $^ $(BASELIBS) $(EXTRALIBS) + + + # For debugging: generate preprocessed, generate assembler +@@ -171,7 +161,6 @@ + .%.d: %.c + @echo " deps for $<" + @$(CC) $(CPPFLAGS) $(CFLAGS) -MM $< | perl -pe 's#\bdoc.g-c\b##' > $@ +-include $(D_FILES) + + tools/fsvs-chrooter: tools/fsvs-chrooter.c + tools/fsvs-chrooter: interface.h config.h diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch deleted file mode 100644 index f06070f4beee..000000000000 --- a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fixes --as-needed support(bug #294834) -Verbose build -Fixes underlinking(bug #463684) - patch went upstream - ---- fsvs-1.2.5/src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400 -+++ fsvs-1.2.5/src/Makefile.in 2013-08-19 13:30:16.186082295 +0400 -@@ -18,7 +18,7 @@ - CFLAGS := @CFLAGS@ @NEED_FNESTED_FUNCTIONS@ - CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"' - LDFLAGS := @LDFLAGS@ --FSVS_LDFLAGS = $(LDFLAGS) -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -+FSVS_LIBS = -lsvn_subr-1 -lsvn_delta-1 -lsvn_ra-1 -lpcre -lgdbm -ldl - EXTRALIBS := @EXTRALIBS@ - WAA_CHARS?= @WAA_WC_MD5_CHARS@ - -@@ -146,13 +146,13 @@ - ################################ Rules ###################################### - %.o: %.c - @echo " CC $<" -- @$(CC) $(CFLAGS) -c -o $@ $< -+ $(CC) $(CFLAGS) -c -o $@ $< - - # if the Makefile has changed, the output will (at least sometimes) - # change, too. - $(DEST): $(C_FILES:%.c=%.o) - @echo " Link $@" -- @$(CC) $(FSVS_LDFLAGS) $(LDLIBS) $(LIBS) $(EXTRALIBS) -o $@ $^ -+ $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(LIBS) $(FSVS_LIBS) $(EXTRALIBS) - ifeq (@ENABLE_RELEASE@, 1) - -strip $@ - endif |