← Back to branch summary

~ubuntu-branches/debian/sid/gridsite/sid

« back to all changes in this revision

Viewing changes to debian/patches/gridsite-linkorder.patch

  • Committer: Bazaar Package Importer
  • Author(s): Mattias Ellert
  • Date: 2011-06-20 23:12:08 UTC
  • Revision ID: james.westby@ubuntu.com-20110620231208-bqkya4428dh18q3r
Tags: 1.7.13-5
* Fix linkorder for -Wl,--as-needed (backport from ubuntu)
* Fix pointer to integer conversion (backport from ubuntu)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/gridsite-linkorder.patch
 
1
diff -ur org.gridsite.core.orig/src/Makefile org.gridsite.core/src/Makefile
 
2
--- org.gridsite.core.orig/src/Makefile 2011-04-05 14:58:10.000000000 +0200
 
3
+++ org.gridsite.core/src/Makefile      2011-06-20 23:28:27.184004644 +0200
 
4
@@ -84,9 +84,9 @@
 
5
 libgridsite.so.$(VERSION): grst_err.o grst_x509.o grst_gacl.o grst_xacml.o \
 
6
                            grst_http.o grst_asn1.o grst_htcp.o
 
7
        gcc -shared -Wl,-soname,libgridsite.so.$(MINOR_VERSION) \
 
8
-         -o libgridsite.so.$(PATCH_VERSION) -lcrypto `xml2-config --libs` \
 
9
+         -o libgridsite.so.$(PATCH_VERSION) \
 
10
          grst_err.o grst_x509.o grst_gacl.o grst_xacml.o grst_http.o \
 
11
-         grst_asn1.o grst_htcp.o 
 
12
+         grst_asn1.o grst_htcp.o -lcrypto $(XML2_LIBS)
 
13
        ln -sf libgridsite.so.$(VERSION) libgridsite.so
 
14
        ln -sf libgridsite.so.$(VERSION) libgridsite.so.$(MINOR_VERSION)
 
15
 
 
16
@@ -130,9 +130,9 @@
 
17
                grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o \
 
18
                grst_asn1_globus.o grst_xacml_globus.o grst_htcp_globus.o 
 
19
        gcc -shared -Wl,-soname,libgridsite_globus.so.$(MINOR_VERSION) \
 
20
-         -o libgridsite_globus.so.$(PATCH_VERSION) $(XML2_LIBS) \
 
21
+         -o libgridsite_globus.so.$(PATCH_VERSION) \
 
22
          grst_err_globus.o grst_x509_globus.o grst_gacl_globus.o grst_xacml_globus.o \
 
23
-         grst_http_globus.o grst_asn1_globus.o
 
24
+         grst_http_globus.o grst_asn1_globus.o $(XML2_LIBS)
 
25
        ln -sf libgridsite_globus.so.$(VERSION) libgridsite_globus.so
 
26
 
 
27
 libgridsite_globus.a: grst_err_globus.o grst_x509_globus.o grst_gacl_globus.o grst_http_globus.o grst_asn1_globus.o
 
28
@@ -191,9 +191,9 @@
 
29
                grst_gacl_nossl.o grst_http_nossl.o \
 
30
                grst_xacml_nossl.o grst_htcp_nossl.o 
 
31
        gcc -shared -Wl,-soname,libgridsite_nossl.so.$(MINOR_VERSION) \
 
32
-         -o libgridsite_nossl.so.$(PATCH_VERSION) $(XML2_LIBS) \
 
33
+         -o libgridsite_nossl.so.$(PATCH_VERSION) \
 
34
          grst_err_nossl.o grst_gacl_nossl.o grst_xacml_nossl.o \
 
35
-         grst_http_nossl.o grst_htcp_nossl.o
 
36
+         grst_http_nossl.o grst_htcp_nossl.o $(XML2_LIBS)
 
37
        ln -sf libgridsite_nossl.so.$(VERSION) libgridsite_nossl.so
 
38
 
 
39
 libgridsite_nossl.a: grst_err_nossl.o grst_gacl_nossl.o grst_http_nossl.o