| 1 |
jer 13/10/04 14:21:10 |
| 2 |
|
| 3 |
Added: surf-0.6-gentoo.patch |
| 4 |
Log: |
| 5 |
Fix underlinking (bug #486912). Roll a patch out of the sed scripts. Set PKG_CONFIG for cross-compile fun. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/surf/files/surf-0.6-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-0.6-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/surf/files/surf-0.6-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: surf-0.6-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- a/config.mk 2013-02-10 19:40:14.000000000 +0100 |
| 18 |
+++ b/config.mk 2013-10-04 16:11:28.773331797 +0200 |
| 19 |
@@ -4,27 +4,27 @@ |
| 20 |
# Customize below to fit your system |
| 21 |
|
| 22 |
# paths |
| 23 |
-PREFIX = /usr/local |
| 24 |
-MANPREFIX = ${PREFIX}/share/man |
| 25 |
+PREFIX = /usr |
| 26 |
+MANPREFIX = $(PREFIX)/share/man |
| 27 |
|
| 28 |
-X11INC = /usr/X11R6/include |
| 29 |
-X11LIB = /usr/X11R6/lib |
| 30 |
+X11INC = $(shell $(PKG_CONFIG) --cflags x11) |
| 31 |
+X11LIB = $(shell $(PKG_CONFIG) --libs x11) |
| 32 |
|
| 33 |
-GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` |
| 34 |
-GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` |
| 35 |
+GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-2.0 webkit-1.0) |
| 36 |
+GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-2.0 webkit-1.0) |
| 37 |
|
| 38 |
# includes and libs |
| 39 |
-INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} |
| 40 |
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 |
| 41 |
+INCS = -I. -I/usr/include $(X11INC) $(GTKINC) |
| 42 |
+LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 |
| 43 |
|
| 44 |
# flags |
| 45 |
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE |
| 46 |
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
| 47 |
-LDFLAGS = -g ${LIBS} |
| 48 |
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_BSD_SOURCE |
| 49 |
+CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS) |
| 50 |
+LDFLAGS += $(LIBS) |
| 51 |
|
| 52 |
# Solaris |
| 53 |
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
| 54 |
-#LDFLAGS = ${LIBS} |
| 55 |
+#CFLAGS = -fast $(INCS) -DVERSION=\"$(VERSION)\" |
| 56 |
+#LDFLAGS = $(LIBS) |
| 57 |
|
| 58 |
# compiler and linker |
| 59 |
-CC = cc |
| 60 |
+CC ?= gcc |
| 61 |
--- a/Makefile 2013-02-10 19:40:14.000000000 +0100 |
| 62 |
+++ b/Makefile 2013-10-04 16:05:02.230549420 +0200 |
| 63 |
@@ -4,58 +4,58 @@ |
| 64 |
include config.mk |
| 65 |
|
| 66 |
SRC = surf.c |
| 67 |
-OBJ = ${SRC:.c=.o} |
| 68 |
+OBJ = $(SRC:.c=.o) |
| 69 |
|
| 70 |
all: options surf |
| 71 |
|
| 72 |
options: |
| 73 |
@echo surf build options: |
| 74 |
- @echo "CFLAGS = ${CFLAGS}" |
| 75 |
- @echo "LDFLAGS = ${LDFLAGS}" |
| 76 |
- @echo "CC = ${CC}" |
| 77 |
+ @echo "CFLAGS = $(CFLAGS)" |
| 78 |
+ @echo "LDFLAGS = $(LDFLAGS)" |
| 79 |
+ @echo "CC = $(CC)" |
| 80 |
|
| 81 |
.c.o: |
| 82 |
@echo CC $< |
| 83 |
- @${CC} -c ${CFLAGS} $< |
| 84 |
+ $(CC) -c $(CFLAGS) $< |
| 85 |
|
| 86 |
-${OBJ}: config.h config.mk |
| 87 |
+$(OBJ): config.h config.mk |
| 88 |
|
| 89 |
config.h: |
| 90 |
@echo creating $@ from config.def.h |
| 91 |
- @cp config.def.h $@ |
| 92 |
+ cp config.def.h $@ |
| 93 |
|
| 94 |
-surf: ${OBJ} |
| 95 |
+surf: $(OBJ) |
| 96 |
@echo CC -o $@ |
| 97 |
- @${CC} -o $@ surf.o ${LDFLAGS} |
| 98 |
+ $(CC) -o $@ surf.o $(LDFLAGS) |
| 99 |
|
| 100 |
clean: |
| 101 |
@echo cleaning |
| 102 |
- @rm -f surf ${OBJ} surf-${VERSION}.tar.gz |
| 103 |
+ rm -f surf $(OBJ) surf-$(VERSION).tar.gz |
| 104 |
|
| 105 |
dist: clean |
| 106 |
@echo creating dist tarball |
| 107 |
- @mkdir -p surf-${VERSION} |
| 108 |
- @cp -R LICENSE Makefile config.mk config.def.h README \ |
| 109 |
+ mkdir -p surf-$(VERSION) |
| 110 |
+ cp -R LICENSE Makefile config.mk config.def.h README \ |
| 111 |
surf-open.sh arg.h TODO.md surf.png \ |
| 112 |
- surf.1 ${SRC} surf-${VERSION} |
| 113 |
- @tar -cf surf-${VERSION}.tar surf-${VERSION} |
| 114 |
- @gzip surf-${VERSION}.tar |
| 115 |
- @rm -rf surf-${VERSION} |
| 116 |
+ surf.1 $(SRC) surf-$(VERSION) |
| 117 |
+ tar -cf surf-$(VERSION).tar surf-$(VERSION) |
| 118 |
+ gzip surf-$(VERSION).tar |
| 119 |
+ rm -rf surf-$(VERSION) |
| 120 |
|
| 121 |
install: all |
| 122 |
- @echo installing executable file to ${DESTDIR}${PREFIX}/bin |
| 123 |
- @mkdir -p ${DESTDIR}${PREFIX}/bin |
| 124 |
- @cp -f surf ${DESTDIR}${PREFIX}/bin |
| 125 |
- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf |
| 126 |
- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 |
| 127 |
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 |
| 128 |
- @sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1 |
| 129 |
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1 |
| 130 |
+ @echo installing executable file to $(DESTDIR)$(PREFIX)/bin |
| 131 |
+ mkdir -p $(DESTDIR)$(PREFIX)/bin |
| 132 |
+ cp -f surf $(DESTDIR)$(PREFIX)/bin |
| 133 |
+ chmod 755 $(DESTDIR)$(PREFIX)/bin/surf |
| 134 |
+ @echo installing manual page to $(DESTDIR)$(MANPREFIX)/man1 |
| 135 |
+ mkdir -p $(DESTDIR)$(MANPREFIX)/man1 |
| 136 |
+ sed "s/VERSION/$(VERSION)/g" < surf.1 > $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 137 |
+ chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 138 |
|
| 139 |
uninstall: |
| 140 |
- @echo removing executable file from ${DESTDIR}${PREFIX}/bin |
| 141 |
- @rm -f ${DESTDIR}${PREFIX}/bin/surf |
| 142 |
- @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 |
| 143 |
- @rm -f ${DESTDIR}${MANPREFIX}/man1/surf.1 |
| 144 |
+ @echo removing executable file from $(DESTDIR)$(PREFIX)/bin |
| 145 |
+ rm -f $(DESTDIR)$(PREFIX)/bin/surf |
| 146 |
+ @echo removing manual page from $(DESTDIR)$(MANPREFIX)/man1 |
| 147 |
+ rm -f $(DESTDIR)$(MANPREFIX)/man1/surf.1 |
| 148 |
|
| 149 |
.PHONY: all options clean dist install uninstall |
Archives