1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
From 5ffe5615fa1b025fc9e18887bf88bf745b084e38 Mon Sep 17 00:00:00 2001
From: Gerrit Pape <pape@smarden.org>
Date: Fri, 2 May 2008 17:57:37 +0000
Subject: [PATCH] Makefile: avoid rpath; workaround some linking issues
---
Makefile | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 3ab24d5..acf531e 100644
--- a/Makefile
+++ b/Makefile
@@ -71,16 +71,16 @@ cvm-checkpassword.o: compile cvm-checkpassword.c v2client.h facts.h errors.h
./compile cvm-checkpassword.c
cvm-mysql: cvm-mysql.o ltload libcvm-module.la libcvm-sql.la crypt.lib
- ./ltload cvm-mysql libcvm-module.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
+ ./ltload cvm-mysql libcvm-module.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
cvm-mysql-local: cvm-mysql-local.o ltload cvm-mysql.o libcvm-local.la libcvm-sql.la crypt.lib
- ./ltload cvm-mysql-local cvm-mysql.o libcvm-local.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
+ ./ltload cvm-mysql-local cvm-mysql.o libcvm-local.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
cvm-mysql-local.o: compile cvm-mysql-local.c
./compile cvm-mysql-local.c
cvm-mysql-udp: cvm-mysql-udp.o ltload cvm-mysql.o libcvm-udp.la libcvm-sql.la crypt.lib
- ./ltload cvm-mysql-udp cvm-mysql.o libcvm-udp.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
+ ./ltload cvm-mysql-udp cvm-mysql.o libcvm-udp.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/mysql -lmysqlclient `cat crypt.lib`
cvm-mysql-udp.o: compile cvm-mysql-udp.c
./compile cvm-mysql-udp.c
@@ -89,16 +89,16 @@ cvm-mysql.o: compile cvm-mysql.c module.h credentials.h errors.h facts.h sql.h
./compile cvm-mysql.c
cvm-pgsql: cvm-pgsql.o ltload libcvm-module.la libcvm-sql.la crypt.lib
- ./ltload cvm-pgsql libcvm-module.la libcvm-sql.la -lbg -lpwcmp -lpq `cat crypt.lib`
+ ./ltload cvm-pgsql libcvm-module.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -lpq `cat crypt.lib`
cvm-pgsql-local: cvm-pgsql-local.o ltload cvm-pgsql.o libcvm-local.la libcvm-sql.la crypt.lib
- ./ltload cvm-pgsql-local cvm-pgsql.o libcvm-local.la libcvm-sql.la -lbg -lpwcmp -lpq `cat crypt.lib`
+ ./ltload cvm-pgsql-local cvm-pgsql.o libcvm-local.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -lpq `cat crypt.lib`
cvm-pgsql-local.o: compile cvm-pgsql-local.c
./compile cvm-pgsql-local.c
cvm-pgsql-udp: cvm-pgsql-udp.o ltload cvm-pgsql.o libcvm-udp.la libcvm-sql.la crypt.lib
- ./ltload cvm-pgsql-udp cvm-pgsql.o libcvm-udp.la libcvm-sql.la -lbg -lpwcmp -lpq `cat crypt.lib`
+ ./ltload cvm-pgsql-udp cvm-pgsql.o libcvm-udp.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -lpq `cat crypt.lib`
cvm-pgsql-udp.o: compile cvm-pgsql-udp.c
./compile cvm-pgsql-udp.c
@@ -107,7 +107,7 @@ cvm-pgsql.o: compile cvm-pgsql.c module.h credentials.h errors.h facts.h sql.h
./compile cvm-pgsql.c
cvm-pwfile: cvm-pwfile.o ltload libcvm-module.la crypt.lib socket.lib
- ./ltload cvm-pwfile libcvm-module.la -lbg -lpwcmp `cat crypt.lib` `cat socket.lib`
+ ./ltload cvm-pwfile libcvm-module.la -lbg /usr/lib/bglibs/libpwcmp.a `cat crypt.lib` `cat socket.lib`
cvm-pwfile.o: compile cvm-pwfile.c module.h credentials.h errors.h facts.h
./compile cvm-pwfile.c
@@ -119,7 +119,7 @@ cvm-qmail.o: compile cvm-qmail.c module.h credentials.h errors.h facts.h qmail.h
./compile cvm-qmail.c
cvm-sqlite: cvm-sqlite.o ltload libcvm-module.la libcvm-sql.la crypt.lib
- ./ltload cvm-sqlite libcvm-module.la libcvm-sql.la -lbg -lpwcmp -L/usr/lib/sqlite -lsqlite3 `cat crypt.lib`
+ ./ltload cvm-sqlite libcvm-module.la libcvm-sql.la -lbg /usr/lib/bglibs/libpwcmp.a -L/usr/lib/sqlite -lsqlite3 `cat crypt.lib`
cvm-sqlite.o: compile cvm-sqlite.c cvm/module.h credentials.h errors.h facts.h sql.h
./compile cvm-sqlite.c
@@ -226,7 +226,7 @@ load: conf-ld conf-bglibs
( bglibs=`head -n 1 conf-bglibs`; \
echo '#!/bin/sh';\
echo 'main="$$1"; shift';\
- echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
+ echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
) >load
chmod 755 load
@@ -245,7 +245,7 @@ ltload: conf-ld conf-bglibs
if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
echo '#!/bin/sh';\
echo 'main="$$1"; shift';\
- echo exec libtool --mode=link --silent $$tag `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' -lbg-sysdeps; \
+ echo exec libtool --mode=link --silent $$tag `head -n 1 conf-ld` -L. "-L'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}'; \
) >ltload
chmod 755 ltload
@@ -254,7 +254,7 @@ makeshlib: conf-ld conf-lib LIBVERSION Makefile
echo '#!/bin/sh'; \
echo 'lib="$$1"; shift';\
echo 'rm -f "$$lib"';\
- echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"}';\
+ echo libtool --mode=link --silent $$tag `head -n 1 conf-ld` '-o "$$lib" -rpath' `head -n 1 conf-lib` -version-info `head -n 1 LIBVERSION` '$${1+"$$@"} -lbg';\
) >makeshlib
chmod 755 makeshlib
--
1.7.0.3
|
