mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-05 14:07:27 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 1e34d3b..563e467 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,16 +1,16 @@
|
|
-CC=gcc
|
|
+CC?=gcc
|
|
#CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC -DDEBUG -g -O0
|
|
-CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC
|
|
+CFLAGS+=-Wall -Wstrict-prototypes -fPIC
|
|
LIBRARY=libnss_cache.so.2.0
|
|
LINKS=libnss_cache.so.2 libnss_cache.so
|
|
-DESTDIR=/
|
|
-PREFIX=$(DESTDIR)/usr
|
|
+DESTDIR?=
|
|
+PREFIX?=$(DESTDIR)/usr
|
|
BUILD=.libs
|
|
BUILD64=.libs64
|
|
BUILD32=.libs32
|
|
-LIBDIR=$(PREFIX)/lib
|
|
-LIBDIR64=$(PREFIX)/lib64
|
|
-LIBDIR32=$(PREFIX)/lib32
|
|
+LIBDIR?=$(PREFIX)/lib
|
|
+LIBDIR64?=$(PREFIX)/lib64
|
|
+LIBDIR32?=$(PREFIX)/lib32
|
|
SONAME=libnss_cache.so.2
|
|
LD_SONAME=-Wl,-soname,$(SONAME)
|
|
TESTBIN=.testbin
|
|
@@ -97,17 +97,17 @@ install_amd64: install32
|
|
nss_cache:
|
|
[ -d $(BUILD) ] || mkdir $(BUILD)
|
|
$(CC) $(CFLAGS) -c nss_cache.c -o $(BUILD)/nss_cache.o
|
|
- $(CC) -shared $(LD_SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
|
|
+ $(CC) $(LDFLAGS) -shared $(LD_SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
|
|
|
|
nss_cache64: nss_cache
|
|
[ -d $(BUILD64) ] || mkdir $(BUILD64)
|
|
$(CC) $(CFLAGS) -m64 -c nss_cache.c -o $(BUILD64)/nss_cache.o
|
|
- $(CC) -m64 -shared $(LD_SONAME) -o $(BUILD64)/$(LIBRARY) $(BUILD64)/nss_cache.o
|
|
+ $(CC) $(LDFLAGS) -m64 -shared $(LD_SONAME) -o $(BUILD64)/$(LIBRARY) $(BUILD64)/nss_cache.o
|
|
|
|
nss_cache32: nss_cache
|
|
[ -d $(BUILD32) ] || mkdir $(BUILD32)
|
|
$(CC) $(CFLAGS) -m32 -c nss_cache.c -o $(BUILD32)/nss_cache.o
|
|
- $(CC) -m32 -shared $(LD_SONAME) -o $(BUILD32)/$(LIBRARY) $(BUILD32)/nss_cache.o
|
|
+ $(CC) $(LDFLAGS) -m32 -shared $(LD_SONAME) -o $(BUILD32)/$(LIBRARY) $(BUILD32)/nss_cache.o
|
|
|
|
clean:
|
|
rm -rf $(BUILD)
|