diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-01-27 15:33:09 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-01-27 15:33:09 +0000 |
| commit | a69c29c68182c4fa4fa8b4b4d52d5a2c6914d023 (patch) | |
| tree | 87410792e5b13de808179a662df45d7d5c87cf29 /www-client/uzbl/files | |
| parent | re-added ~x86-interix keywords (diff) | |
| download | gentoo-2-a69c29c68182c4fa4fa8b4b4d52d5a2c6914d023.tar.gz gentoo-2-a69c29c68182c4fa4fa8b4b4d52d5a2c6914d023.tar.bz2 gentoo-2-a69c29c68182c4fa4fa8b4b4d52d5a2c6914d023.zip | |
fixed live ebuild && patch - bug 302331
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'www-client/uzbl/files')
| -rw-r--r-- | www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch index 73561349986d..a0cf9506dad3 100644 --- a/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch +++ b/www-client/uzbl/files/uzbl-9999-makefile-cleanup.patch @@ -1,39 +1,38 @@ ---- Makefile.old 2009-12-05 19:22:12.079131232 +0200 -+++ Makefile 2009-12-05 19:24:51.863115587 +0200 +--- Makefile.orig 2010-01-27 17:28:15.809737445 +0200 ++++ Makefile 2010-01-27 17:28:12.985756931 +0200 @@ -1,7 +1,7 @@ # first entries are for gnu make, 2nd for BSD make. see http://lists.uzbl.org/pipermail/uzbl-dev-uzbl.org/2009-July/000177.html --CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic --CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -+CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic -+CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic +-CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic +-CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -ggdb -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ++CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DCOMMIT="\"$(shell ./misc/hash.sh)\"" $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic ++CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -Wall -W -DARCH='"\""'`uname -m`'"\""' -lgthread-2.0 -DCOMMIT='"\""'`./misc/hash.sh`'"\""' $(CPPFLAGS) -fPIC -W -Wall -Wextra -pedantic LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS) LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS) -@@ -32,10 +32,6 @@ +@@ -34,9 +34,6 @@ @echo LINKING object files @${CC} -o $@ ${OBJ} ${LDFLAGS} @echo ... done. - @echo Stripping binary - @strip $@ - @echo ... done. -- - uzbl-browser: uzbl-core -@@ -88,14 +84,10 @@ + uzbl-browser: uzbl-core +@@ -96,14 +93,10 @@ install-uzbl-core: all install -d $(INSTALLDIR)/bin - install -d $(INSTALLDIR)/share/uzbl/docs install -d $(INSTALLDIR)/share/uzbl/examples -- cp -rp docs $(INSTALLDIR)/share/uzbl/ -- cp -rp config.h $(INSTALLDIR)/share/uzbl/docs/ -+ cp -rp config.h $(INSTALLDIR)/share/uzbl/ - cp -rp examples $(INSTALLDIR)/share/uzbl/ +- cp -rp docs $(INSTALLDIR)/share/uzbl/ +- cp -rp src/config.h $(INSTALLDIR)/share/uzbl/docs/ ++ cp -rp src/config.h $(INSTALLDIR)/share/uzbl/ + cp -rp examples $(INSTALLDIR)/share/uzbl/ install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core - install -m644 AUTHORS $(INSTALLDIR)/share/uzbl/docs - install -m644 README $(INSTALLDIR)/share/uzbl/docs - sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/uzbl/config + sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config - install-uzbl-browser: all + install-uzbl-browser: |