From a833e3f4a431b8eea751b7420e127787f9c92117 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Dec 2017 12:06:33 +0000 Subject: gentoo resync : 04.12.2017 --- net-proxy/haproxy/files/haproxy-1.8-contrib.patch | 81 ----------------------- 1 file changed, 81 deletions(-) delete mode 100644 net-proxy/haproxy/files/haproxy-1.8-contrib.patch (limited to 'net-proxy/haproxy/files') diff --git a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch deleted file mode 100644 index a3e336a57734..000000000000 --- a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch +++ /dev/null @@ -1,81 +0,0 @@ -From c702537864f7e062d18f4ccce3e29d14d4ccf05f Mon Sep 17 00:00:00 2001 -From: Christian Ruppert -Date: Thu, 30 Nov 2017 10:11:36 +0100 -Subject: [PATCH] Fix LDFLAGS vs. LIBS re linking order - -Signed-off-by: Christian Ruppert ---- - contrib/mod_defender/Makefile | 5 ++--- - contrib/modsecurity/Makefile | 5 ++--- - contrib/spoa_example/Makefile | 5 ++--- - 3 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile -index ac17774d..efc7d7f6 100644 ---- a/contrib/mod_defender/Makefile -+++ b/contrib/mod_defender/Makefile -@@ -28,9 +28,8 @@ EVENT_INC := /usr/include - endif - - CFLAGS += -g -Wall -pthread --LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm - INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC) --LIBS = -+LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm - - CXXFLAGS = -g -std=gnu++11 - CXXINCS += -I$(MOD_DEFENDER_SRC) -I$(MOD_DEFENDER_SRC)/deps -I$(APACHE2_INC) -I$(APR_INC) -@@ -43,7 +42,7 @@ CXXSRCS = $(wildcard $(MOD_DEFENDER_SRC)/*.cpp) - CXXOBJS = $(patsubst %.cpp, %.o, $(CXXSRCS)) - - defender: $(OBJS) $(CXXOBJS) -- $(LD) -o $@ $^ $(LDFLAGS) $(LIBS) -+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) - - install: defender - install defender $(DESTDIR)$(BINDIR) -diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile -index bb918c30..aa0d6e38 100644 ---- a/contrib/modsecurity/Makefile -+++ b/contrib/modsecurity/Makefile -@@ -34,14 +34,13 @@ EVENT_INC := /usr/include - endif - - CFLAGS += -g -Wall -pthread --LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl - INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC) --LIBS = -+LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl - - OBJS = spoa.o modsec_wrapper.o - - modsecurity: $(OBJS) -- $(LD) $(LDFLAGS) $(LIBS) -o $@ $^ $(MODSEC_LIB)/standalone.a -+ $(LD) $(LDFLAGS) -o $@ $^ $(MODSEC_LIB)/standalone.a $(LIBS) - - install: modsecurity - install modsecurity $(DESTDIR)$(BINDIR) -diff --git a/contrib/spoa_example/Makefile b/contrib/spoa_example/Makefile -index d04a01e1..c44c2b87 100644 ---- a/contrib/spoa_example/Makefile -+++ b/contrib/spoa_example/Makefile -@@ -6,15 +6,14 @@ CC = gcc - LD = $(CC) - - CFLAGS = -g -O2 -Wall -Werror -pthread --LDFLAGS = -lpthread -levent -levent_pthreads - INCS += -I../../ebtree -I./include --LIBS = -+LIBS = -lpthread -levent -levent_pthreads - - OBJS = spoa.o - - - spoa: $(OBJS) -- $(LD) $(LDFLAGS) $(LIBS) -o $@ $^ -+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) - - install: spoa - install spoa $(DESTDIR)$(BINDIR) --- -2.13.6 -- cgit v1.2.3