| 1 |
aballier 08/04/19 13:49:37 |
| 2 |
|
| 3 |
Added: libclxclient-3.6.1-Makefile.patch |
| 4 |
Log: |
| 5 |
version bump, bug #218248 |
| 6 |
(Portage version: 2.1.5_rc4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libclxclient/files/libclxclient-3.6.1-Makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libclxclient-3.6.1-Makefile.patch |
| 15 |
=================================================================== |
| 16 |
Index: clxclient-3.6.1/Makefile |
| 17 |
=================================================================== |
| 18 |
--- clxclient-3.6.1.orig/Makefile |
| 19 |
+++ clxclient-3.6.1/Makefile |
| 20 |
@@ -28,9 +28,9 @@ VERSION = $(MAJVERS).$(MINVERS) |
| 21 |
DISTDIR = clxclient-$(VERSION) |
| 22 |
|
| 23 |
|
| 24 |
-CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 |
| 25 |
-LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) `freetype-config --libs` |
| 26 |
-LDLIBS += |
| 27 |
+CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS |
| 28 |
+LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR) |
| 29 |
+LDLIBS += `freetype-config --libs` |
| 30 |
|
| 31 |
|
| 32 |
CLXCLIENT_SO = libclxclient.so |
| 33 |
@@ -43,15 +43,13 @@ CLXCLIENT_H = clxclient.h |
| 34 |
|
| 35 |
|
| 36 |
$(CLXCLIENT_MIN): $(CLXCLIENT_O) |
| 37 |
- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) |
| 38 |
+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) $(LDLIBS) |
| 39 |
|
| 40 |
|
| 41 |
install: $(CLXCLIENT_MIN) |
| 42 |
- /usr/bin/install -d $(PREFIX)/$(LIBDIR) |
| 43 |
- /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include |
| 44 |
- /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) |
| 45 |
- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) |
| 46 |
- ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) |
| 47 |
+ /usr/bin/install -m 644 -D $(CLXCLIENT_H) $(DESTDIR)$(PREFIX)/include/$(CLXCLIENT_H) |
| 48 |
+ /usr/bin/install -m 755 -D $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_MIN) |
| 49 |
+ ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) |
| 50 |
|
| 51 |
|
| 52 |
clean: |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
-- |
| 57 |
gentoo-commits@l.g.o mailing list |
Archives