* [gentoo-commits] gentoo-x86 commit in x11-plugins/docker/files: docker-1.5-makefile.patch
@ 2008-04-24 9:04 David Shakaryan (omp)
0 siblings, 0 replies; 2+ messages in thread
From: David Shakaryan (omp) @ 2008-04-24 9:04 UTC (permalink / raw
To: gentoo-commits
omp 08/04/24 09:04:06
Added: docker-1.5-makefile.patch
Log:
Various QA fixes by Jakub Moc. (bug #207733)
(Portage version: 2.1.5_rc3)
Revision Changes Path
1.1 x11-plugins/docker/files/docker-1.5-makefile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile.patch?rev=1.1&content-type=text/plain
Index: docker-1.5-makefile.patch
===================================================================
--- Makefile.orig 2002-11-20 11:20:49.000000000 +0100
+++ Makefile 2008-01-27 20:14:14.000000000 +0100
@@ -5,12 +5,12 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Change this PREFIX to where you want docker to be installed
-PREFIX=/usr/local
+PREFIX=/usr
# Change this XLIBPATH to point to your X11 development package's installation
-XLIBPATH=/usr/X11R6/lib
+XLIBPATH=/usr/lib
# Sets some flags for stricter compiling
-CFLAGS=-pedantic -Wall -W -O
+CFLAGS+=-pedantic -Wall -W
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# #
@@ -24,7 +24,7 @@
target=docker
sources=docker.c kde.c icons.c xproperty.c net.c
headers=docker.h kde.h icons.h xproperty.h net.h version.h
-extra=README COPYING version.h.in
+extra=README version.h.in
all: $(target) $(sources) $(headers)
@echo Build Successful
@@ -40,7 +40,8 @@
sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
install: all
- install $(target) $(PREFIX)/bin/$(target)
+ install -d $(DESTDIR)$(PREFIX)/bin
+ install $(target) $(DESTDIR)$(PREFIX)/bin/$(target)
uninstall:
rm -f $(PREFIX)/$(target)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-plugins/docker/files: docker-1.5-makefile.patch
@ 2010-03-29 11:00 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-03-29 11:00 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/03/29 11:00:02
Modified: docker-1.5-makefile.patch
Log:
Fix building with -Wl,--as-needed and respect LDFLAGS wrt #248605.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-plugins/docker/files/docker-1.5-makefile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile.patch?r1=1.1&r2=1.2
Index: docker-1.5-makefile.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/docker/files/docker-1.5-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docker-1.5-makefile.patch 24 Apr 2008 09:04:05 -0000 1.1
+++ docker-1.5-makefile.patch 29 Mar 2010 11:00:02 -0000 1.2
@@ -1,22 +1,21 @@
---- Makefile.orig 2002-11-20 11:20:49.000000000 +0100
-+++ Makefile 2008-01-27 20:14:14.000000000 +0100
-@@ -5,12 +5,12 @@
+--- Makefile.orig 2010-03-29 13:57:15.000000000 +0300
++++ Makefile 2010-03-29 13:59:11.000000000 +0300
+@@ -5,12 +5,10 @@
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Change this PREFIX to where you want docker to be installed
-PREFIX=/usr/local
-+PREFIX=/usr
- # Change this XLIBPATH to point to your X11 development package's installation
+-# Change this XLIBPATH to point to your X11 development package's installation
-XLIBPATH=/usr/X11R6/lib
-+XLIBPATH=/usr/lib
++PREFIX = /usr
# Sets some flags for stricter compiling
-CFLAGS=-pedantic -Wall -W -O
-+CFLAGS+=-pedantic -Wall -W
++CFLAGS += -pedantic -Wall -W
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# #
-@@ -24,7 +24,7 @@
+@@ -24,14 +22,14 @@
target=docker
sources=docker.c kde.c icons.c xproperty.c net.c
headers=docker.h kde.h icons.h xproperty.h net.h version.h
@@ -25,7 +24,16 @@
all: $(target) $(sources) $(headers)
@echo Build Successful
-@@ -40,7 +40,8 @@
+
+ $(target): $(sources:.c=.o)
+- $(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
+- `pkg-config --libs glib-2.0` $^ -o $@
++ $(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
++ `pkg-config --libs glib-2.0` -o $@
+
+ %.o: %.c
+ $(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
+@@ -40,7 +38,8 @@
sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
install: all
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-29 11:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-29 11:00 [gentoo-commits] gentoo-x86 commit in x11-plugins/docker/files: docker-1.5-makefile.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2008-04-24 9:04 David Shakaryan (omp)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox