[gentoo-commits] gentoo-x86 commit in sys-libs/libcap/files/2.11: 0001-Make-fixes.patch

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] gentoo-x86 commit in sys-libs/libcap/files/2.11: 0001-Make-fixes.patch
@ 2008-08-18  4:10 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2008-08-18  4:10 UTC (permalink / raw
  To: gentoo-commits

vapier      08/08/18 04:10:12

  Added:                0001-Make-fixes.patch
  Log:
  Version bump #231688 by Arfrever Frehtes Taifersar Arahesis and fix USE=pam dep #231187.
  (Portage version: 2.2_rc6/cvs/Linux 2.6.26.2 x86_64)

Revision  Changes    Path
1.1                  sys-libs/libcap/files/2.11/0001-Make-fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libcap/files/2.11/0001-Make-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libcap/files/2.11/0001-Make-fixes.patch?rev=1.1&content-type=text/plain

Index: 0001-Make-fixes.patch
===================================================================
diff --git a/Make.Rules b/Make.Rules
index d597fde..26335e7 100644
--- a/Make.Rules
+++ b/Make.Rules
@@ -42,26 +42,28 @@ MINOR=11
 
 # Compilation specifics
 
-CC := gcc
-CFLAGS := -O2
-BUILD_CC := $(CC)
-BUILD_CFLAGS := $(CFLAGS)
-AR := ar
-RANLIB := ranlib
-DEBUG = -g #-DDEBUG
-WARNINGS=-fPIC -Wall -Wwrite-strings \
+CC ?= gcc
+CFLAGS ?= -O2 -g
+BUILD_CC ?= $(CC)
+BUILD_CFLAGS ?= $(CFLAGS)
+AR ?= ar
+RANLIB ?= ranlib
+WARNINGS=-Wall -Wwrite-strings \
         -Wpointer-arith -Wcast-qual -Wcast-align \
         -Wstrict-prototypes -Wmissing-prototypes \
         -Wnested-externs -Winline -Wshadow
 LD=$(CC) -Wl,-x -shared
-LDFLAGS := #-g
+LDFLAGS ?= #-g
 
 KERNEL_HEADERS := $(topdir)/libcap/include
-SYSTEM_HEADERS = /usr/include
 IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+CPPFLAGS += $(LIBCAP_CPPFLAGS)
+BUILD_CLAGS += $(LIBCAP_CPPFLAGS)
 INCS=$(topdir)/libcap/include/sys/capability.h
 LDFLAGS += -L$(topdir)/libcap
-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
+CPPFLAGS += -Dlinux
+CFLAGS += $(WARNINGS)
 PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
 # Global cleanup stuff
 
diff --git a/libcap/Makefile b/libcap/Makefile
index da22bd1..55e4fe3 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
@@ -17,7 +17,8 @@ OBJS=$(addsuffix .o, $(FILES))
 MAJLIBNAME=$(LIBNAME).$(VERSION)
 MINLIBNAME=$(MAJLIBNAME).$(MINOR)
 GPERF_OUTPUT = _caps_output.gperf
-LDFLAGS += -lattr
+LDLIBS += -lattr
+CFLAGS += -fPIC
 
 all: $(MINLIBNAME) $(STALIBNAME)
 
@@ -44,15 +45,15 @@ $(STALIBNAME): $(OBJS)
 	$(RANLIB) $@
 
 $(MINLIBNAME): $(OBJS)
-	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
+	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^ $(LDLIBS)
 	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
 	ln -sf $(MAJLIBNAME) $(LIBNAME)
 
 %.o: %.c $(INCLS)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
-	$(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
 
 install: all
 	mkdir -p -m 0755 $(INCDIR)/sys
diff --git a/pam_cap/Makefile b/pam_cap/Makefile
index 6483790..bef59d2 100644
--- a/pam_cap/Makefile
+++ b/pam_cap/Makefile
@@ -14,13 +14,13 @@ install: all
 	install -m 0755 pam_cap.so $(LIBDIR)/security
 
 pam_cap.so: pam_cap.o
-	$(LD) $(CFLAGS) -o pam_cap.so $< $(LDLIBS)
+	$(LD) $(CFLAGS) $(LDFLAGS) -o pam_cap.so $< $(LDLIBS)
 
 pam_cap.o: pam_cap.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 testcompile: test.c pam_cap.o
-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
 
 clean:
 	rm -f *.o *.so testcompile *~
diff --git a/progs/Makefile b/progs/Makefile
index a8e0e53..f568225 100644
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -6,7 +6,7 @@ include $(topdir)/Make.Rules
 #
 PROGS=getpcaps getcap setcap capsh
 
-LDFLAGS += --static 
+LDFLAGS += --static
 LDLIBS += -lcap
 
 all: $(PROGS)
@@ -15,7 +15,7 @@ $(PROGS): %: %.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 %.o: %.c $(INCS)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
 install: all
 	mkdir -p -m 0755 $(SBINDIR)






^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/libcap/files/2.11: 0001-Make-fixes.patch
@ 2008-08-19 22:13 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2008-08-19 22:13 UTC (permalink / raw
  To: gentoo-commits

vapier      08/08/19 22:13:37

  Modified:             0001-Make-fixes.patch
  Log:
  Fix typo in BUILD_CFLAGS #235209 by zimous.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26.2 x86_64)

Revision  Changes    Path
1.2                  sys-libs/libcap/files/2.11/0001-Make-fixes.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libcap/files/2.11/0001-Make-fixes.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libcap/files/2.11/0001-Make-fixes.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/libcap/files/2.11/0001-Make-fixes.patch?r1=1.1&r2=1.2

Index: 0001-Make-fixes.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcap/files/2.11/0001-Make-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001-Make-fixes.patch	18 Aug 2008 04:10:11 -0000	1.1
+++ 0001-Make-fixes.patch	19 Aug 2008 22:13:37 -0000	1.2
@@ -2,7 +2,7 @@
 index d597fde..26335e7 100644
 --- a/Make.Rules
 +++ b/Make.Rules
-@@ -42,26 +42,28 @@ MINOR=11
+@@ -42,26 +42,27 @@
  
  # Compilation specifics
  
@@ -30,10 +30,10 @@
  
  KERNEL_HEADERS := $(topdir)/libcap/include
 -SYSTEM_HEADERS = /usr/include
- IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+-IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
 +LIBCAP_CPPFLAGS = -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
 +CPPFLAGS += $(LIBCAP_CPPFLAGS)
-+BUILD_CLAGS += $(LIBCAP_CPPFLAGS)
++BUILD_CFLAGS += $(LIBCAP_CPPFLAGS)
  INCS=$(topdir)/libcap/include/sys/capability.h
  LDFLAGS += -L$(topdir)/libcap
 -CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-libs/libcap/files/2.11: 0001-Make-fixes.patch
@ 2009-01-17 17:17 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-17 17:17 UTC (permalink / raw
  To: gentoo-commits

vapier      09/01/17 17:17:17

  Removed:              0001-Make-fixes.patch
  Log:
  old



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-01-17 17:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-18  4:10 [gentoo-commits] gentoo-x86 commit in sys-libs/libcap/files/2.11: 0001-Make-fixes.patch Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2008-08-19 22:13 Mike Frysinger (vapier)
2009-01-17 17:17 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox