| 1 |
arfrever 09/05/02 17:27:12 |
| 2 |
|
| 3 |
Added: bestcrypt-1.7.0-respect_LDFLAGS.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 13595-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-crypt/bestcrypt/files/bestcrypt-1.7.0-respect_LDFLAGS.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/bestcrypt/files/bestcrypt-1.7.0-respect_LDFLAGS.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/bestcrypt/files/bestcrypt-1.7.0-respect_LDFLAGS.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: bestcrypt-1.7.0-respect_LDFLAGS.patch |
| 15 |
=================================================================== |
| 16 |
--- Makefile |
| 17 |
+++ Makefile |
| 18 |
@@ -37,7 +37,7 @@ |
| 19 |
BC_CPP = g++ |
| 20 |
BC_CFLAGS = -Wall -fno-strict-aliasing -I$(FRAMEWORK_PATH) $(EXTRA_CFLAGS) -DBC_BACKEND_HAS_PIO |
| 21 |
|
| 22 |
-LDFLAGS = -Wl,-whole-archive,$(BC_BUILD)/$(BACKEND),$(BC_BUILD)/$(TOOLS),-no-whole-archive -L$(BC_BUILD) -lbccore |
| 23 |
+LIBS = -Wl,-whole-archive,$(BC_BUILD)/$(BACKEND),$(BC_BUILD)/$(TOOLS),-no-whole-archive -L$(BC_BUILD) -lbccore -ldl |
| 24 |
|
| 25 |
# main target |
| 26 |
# build subtargets and core |
| 27 |
@@ -46,14 +46,14 @@ |
| 28 |
|
| 29 |
release: Makefile |
| 30 |
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i BC_BUILD="$(BC_BUILD)" BC_CPP=$(BC_CPP) BC_CFLAGS="$(BC_CFLAGS)"; done |
| 31 |
- $(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) |
| 32 |
+ $(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) $(LIBS) |
| 33 |
|
| 34 |
debug: Makefile |
| 35 |
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i BC_BUILD="$(BC_BUILD)" BC_CPP=$(BC_CPP) BC_CFLAGS="$(BC_CFLAGS) -pg -DBC_DEBUG"; done |
| 36 |
- $(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) |
| 37 |
+ $(BC_CPP) $(LDFLAGS) -o $(BC_BUILD)/$(TARGET) $(LIBS) |
| 38 |
|
| 39 |
|
| 40 |
-# subtragets build |
| 41 |
+# subtargets build |
| 42 |
subdirs: |
| 43 |
|
| 44 |
install: subdirs |
| 45 |
--- core/Makefile |
| 46 |
+++ core/Makefile |
| 47 |
@@ -23,7 +23,8 @@ |
| 48 |
# build flags |
| 49 |
CFLAGS = -fPIC |
| 50 |
CFLAGS += $(BC_CFLAGS) |
| 51 |
-LDFLAGS = -shared -Wl,-soname,$(DYNAMIC) -Wl,-whole-archive,$(LOCAL_BUILD)/$(STATIC),-no-whole-archive -ldl |
| 52 |
+LDFLAGS += -shared -Wl,-soname,$(DYNAMIC) |
| 53 |
+LIBS = -Wl,-whole-archive,$(LOCAL_BUILD)/$(STATIC),-no-whole-archive -ldl |
| 54 |
|
| 55 |
|
| 56 |
# ---------------------------------------------------------- |
| 57 |
@@ -35,7 +36,7 @@ |
| 58 |
|
| 59 |
|
| 60 |
$(DYNAMIC): $(STATIC) Makefile |
| 61 |
- $(BC_CPP) $(LDFLAGS) -o $(LOCAL_BUILD)/$(DYNAMIC) |
| 62 |
+ $(BC_CPP) $(LDFLAGS) -o $(LOCAL_BUILD)/$(DYNAMIC) $(LIBS) |
| 63 |
|
| 64 |
|
| 65 |
$(STATIC): |
| 66 |
--- core/mod/v7/kgsha/Makefile |
| 67 |
+++ core/mod/v7/kgsha/Makefile |
| 68 |
@@ -20,12 +20,13 @@ |
| 69 |
TARGET = libkgsha.so |
| 70 |
OBJ = sha1.o random.o sha1defs.o |
| 71 |
COMMON = ../libkgsha_common.a |
| 72 |
-LDFLAGS = -shared -Wl,-soname,$(TARGET) -Wl,-whole-archive,$(COMMON),-no-whole-archive |
| 73 |
+LDFLAGS += -shared -Wl,-soname,$(TARGET) |
| 74 |
+LIBS = -Wl,-whole-archive,$(COMMON),-no-whole-archive |
| 75 |
|
| 76 |
all: $(TARGET) Makefile |
| 77 |
|
| 78 |
$(TARGET):$(OBJ) |
| 79 |
- $(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) |
| 80 |
+ $(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS) |
| 81 |
$(CP) $(TARGET) $(BUILD_PATH) |
| 82 |
|
| 83 |
%.o: %.cpp |
| 84 |
--- core/mod/v7/kgsha256/Makefile |
| 85 |
+++ core/mod/v7/kgsha256/Makefile |
| 86 |
@@ -21,12 +21,13 @@ |
| 87 |
TARGET = libkgsha256.so |
| 88 |
OBJ = sha256.o random.o sha256defs.o |
| 89 |
COMMON = ../libkgsha_common.a |
| 90 |
-LDFLAGS = -shared -Wl,-soname,$(TARGET) -Wl,-whole-archive,$(COMMON),-no-whole-archive |
| 91 |
+LDFLAGS += -shared -Wl,-soname,$(TARGET) |
| 92 |
+LIBS = -Wl,-whole-archive,$(COMMON),-no-whole-archive |
| 93 |
|
| 94 |
all: $(TARGET) Makefile |
| 95 |
|
| 96 |
$(TARGET):$(OBJ) |
| 97 |
- $(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) |
| 98 |
+ $(CPP) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS) |
| 99 |
$(CP) $(TARGET) $(BUILD_PATH) |
| 100 |
|
| 101 |
%.o: %.cpp |
Archives