| 1 |
vapier 15/07/07 08:14:55 |
| 2 |
|
| 3 |
Added: passwdqc-1.3.0-build.patch |
| 4 |
Log: |
| 5 |
Version bump based on last pam_passwdqc package #491836 by Florian Steinel. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/passwdqc/files/passwdqc-1.3.0-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: passwdqc-1.3.0-build.patch |
| 16 |
=================================================================== |
| 17 |
--- a/Makefile |
| 18 |
+++ b/Makefile |
| 19 |
@@ -20,10 +20,11 @@ |
| 20 |
BINMODE = 755 |
| 21 |
CONFDIR = /etc |
| 22 |
CONFMODE = 644 |
| 23 |
-SHARED_LIBDIR = /lib |
| 24 |
+LIBDIR = lib |
| 25 |
+SHARED_LIBDIR = /$(LIBDIR) |
| 26 |
SHARED_LIBDIR_SUN = /usr/lib |
| 27 |
SHARED_LIBDIR_REL = ../..$(SHARED_LIBDIR) |
| 28 |
-DEVEL_LIBDIR = /usr/lib |
| 29 |
+DEVEL_LIBDIR = /usr/$(LIBDIR) |
| 30 |
SECUREDIR = /lib/security |
| 31 |
SECUREDIR_SUN = /usr/lib/security |
| 32 |
SECUREDIR_DARWIN = /usr/lib/pam |
| 33 |
@@ -48,7 +49,7 @@ |
| 34 |
INSTALL_SUN = /usr/ucb/install -c |
| 35 |
CFLAGS = -Wall -W -O2 |
| 36 |
CFLAGS_lib = $(CFLAGS) -fPIC |
| 37 |
-CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer |
| 38 |
+CFLAGS_bin = $(CFLAGS) |
| 39 |
|
| 40 |
LDFLAGS = |
| 41 |
LDFLAGS_shared = --shared |
| 42 |
@@ -93,7 +94,7 @@ |
| 43 |
|
| 44 |
default: all |
| 45 |
|
| 46 |
-all pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils: |
| 47 |
+all lib pam utils install install_lib install_pam install_utils uninstall remove remove_lib remove_pam remove_utils: |
| 48 |
case "`uname -s`" in \ |
| 49 |
Linux) $(MAKE) CFLAGS_lib="$(CFLAGS_lib) -DHAVE_SHADOW" \ |
| 50 |
LDFLAGS_lib="$(LDFLAGS_lib_LINUX)" \ |
| 51 |
@@ -126,18 +127,20 @@ |
| 52 |
|
| 53 |
all_wrapped: pam_wrapped utils_wrapped |
| 54 |
|
| 55 |
+lib_wrapped: $(SHARED_LIB) $(DEVEL_LIB) |
| 56 |
+ |
| 57 |
pam_wrapped: $(SHARED_PAM) |
| 58 |
|
| 59 |
utils_wrapped: $(BINS) |
| 60 |
|
| 61 |
$(SHARED_LIB): $(OBJS_LIB) $(MAP_LIB) |
| 62 |
- $(LD_lib) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB) |
| 63 |
+ $(LD_lib) $(LDFLAGS) $(LDFLAGS_lib) $(OBJS_LIB) $(LDLIBS_lib) -o $(SHARED_LIB) |
| 64 |
|
| 65 |
$(DEVEL_LIB): $(SHARED_LIB) |
| 66 |
$(LN_s) $(SHARED_LIB) $(DEVEL_LIB) |
| 67 |
|
| 68 |
$(SHARED_PAM): $(OBJS_PAM) $(MAP_PAM) $(DEVEL_LIB) |
| 69 |
- $(LD_lib) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM) |
| 70 |
+ $(LD_lib) $(LDFLAGS) $(LDFLAGS_pam) $(OBJS_PAM) $(LDLIBS_pam) -L. -lpasswdqc -o $(SHARED_PAM) |
| 71 |
|
| 72 |
pwqgen: $(OBJS_GEN) $(DEVEL_LIB) |
| 73 |
$(LD) $(LDFLAGS) $(OBJS_GEN) -L. -lpasswdqc -o $@ |
Archives