diff options
Diffstat (limited to 'x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch')
| -rw-r--r-- | x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch index 8b84a9963469..3066b0981a1f 100644 --- a/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch +++ b/x11-wm/aewm++/files/aewm++-1.1.5-makefile.patch @@ -1,29 +1,35 @@ -Respect CFLAGS, LDFLAGS, don't strip binaries +* Respect CXX, CXXFLAGS, LDFLAGS, LIBS +* Don't strip binaries +https://bugs.gentoo.org/336099 -http://bugs.gentoo.org/show_bug.cgi?id=336099 - ---- aewm++-1.1.5/Makefile -+++ aewm++-1.1.5/Makefile -@@ -1,9 +1,6 @@ - CC = g++ +--- a/Makefile ++++ b/Makefile +@@ -1,14 +1,9 @@ +-CC = g++ -ADDITIONAL_CFLAGS = -g -O2 -march=i686 -Wall - +- prefix = /usr -INCLUDES = -I$/usr/X11R6 -LDPATH = -L/usr/X11R6/lib - LIBS = -lXext -lX11 +-LIBS = -lXext -lX11 ++LIBS += -lXext -lX11 # SHAPE = Shape Extension -@@ -28,14 +25,13 @@ + # NEED_SETENV = Does your Unix not support the setenv function? Use this! +-DEFINES = -DSHAPE #-DNEED_SETENV ++CPPFLAGS += -DSHAPE #-DNEED_SETENV + HEADERS = aewm.hh \ + client.hh \ + windowmanager.hh \ +@@ -28,14 +23,10 @@ all: aewm++ aewm++: $(OBJS) - $(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@ -+ $(CXX) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@ - - $(OBJS): %.o: %.cc $(HEADERS) +- +-$(OBJS): %.o: %.cc $(HEADERS) - $(CC) $(CFLAGS) $(ADDITIONAL_CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ -+ $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@ install: all - mkdir -p $(DESTDIR)$(prefix)/bin |