← Back to branch summary

~peter-pearse/ubuntu/natty/tcl8.4/prop001

« back to all changes in this revision

Viewing changes to debian/patches/build

  • Committer: Bazaar Package Importer
  • Author(s): Chris Waters, Sergei Golovan, Chris Waters
  • Date: 2007-07-25 04:21:47 UTC
  • Revision ID: james.westby@ubuntu.com-20070725042147-v30r07k3345cocy9
Tags: 8.4.15-1
http://bugs.debian.org/400820
http://bugs.debian.org/424055
http://bugs.debian.org/426251
http://bugs.debian.org/403169
* New maintainer Tcl/Tk Debian Packagers
  <pkg-tcltk-devel@lists.alioth.debian.org>.

[ Sergei Golovan ]
* New upstream release (closes: #400820, #424055, #426251).
* Use quilt for patch management.
* Fixed sections inside manual pages.
* Added get-orig-source target to debian/rules.
* Added headers from compat directory to tcl8.4-dev package.
* Added list of copyright holders and files distributed under special
  conditions to debian/copyright (closes: #403169).
[Chris Waters]
* Added Anselm Lingnau to uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build
 
1
Index: tcl8.4-8.4.15/unix/configure
 
2
===================================================================
 
3
--- tcl8.4-8.4.15.orig/unix/configure   2007-05-25 00:40:13.000000000 +0400
 
4
+++ tcl8.4-8.4.15/unix/configure        2007-05-25 22:55:55.000000000 +0400
 
5
@@ -2504,6 +2504,9 @@
 
6
                if test "`uname -s`" = "AIX" ; then
 
7
                    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
 
8
                fi
 
9
+               if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
 
10
+                   system=NetBSD-Debian
 
11
+               fi
 
12
            fi
 
13
        fi
 
14
     
 
15
@@ -3070,12 +3073,15 @@
 
16
            # get rid of the warnings.
 
17
            #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
18
 
 
19
+           # following line added by CW for Debian GNU/Linux
 
20
+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 
21
+
 
22
            if test "$have_dl" = yes; then
 
23
                SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
 
24
                DL_OBJS="tclLoadDl.o"
 
25
                DL_LIBS="-ldl"
 
26
                LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 
27
-               CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 
28
+               CC_SEARCH_FLAGS=""
 
29
                LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
30
            else
 
31
                ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 
32
@@ -3180,13 +3186,16 @@
 
33
            SHLIB_LD_LIBS='${LIBS}'
 
34
            SHLIB_SUFFIX=".so"
 
35
 
 
36
+           # following line added by CW for Debian GNU/Hurd
 
37
+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 
38
+
 
39
            if test "$have_dl" = yes; then
 
40
                SHLIB_LD="${CC} -shared"
 
41
-               DL_OBJS=""
 
42
+               DL_OBJS="tclLoadDl.o"
 
43
                DL_LIBS="-ldl"
 
44
                LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 
45
                CC_SEARCH_FLAGS=""
 
46
-               LD_SEARCH_FLAGS=""
 
47
+               LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
 
48
            else
 
49
                ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 
50
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
 
51
@@ -3218,7 +3227,7 @@
 
52
   echo "$ac_t""yes" 1>&6
 
53
   
 
54
                    SHLIB_LD="ld -shared"
 
55
-                   DL_OBJS=""
 
56
+                   DL_OBJS="tclLoadDld.o"
 
57
                    DL_LIBS="-ldld"
 
58
                    CC_SEARCH_FLAGS=""
 
59
                    LD_SEARCH_FLAGS=""
 
60
@@ -3264,7 +3273,20 @@
 
61
            CC_SEARCH_FLAGS=""
 
62
            LD_SEARCH_FLAGS=""
 
63
            ;;
 
64
-       NetBSD-*|FreeBSD-[1-2].*)
 
65
+       NetBSD-Debian)
 
66
+           SHLIB_CFLAGS="-fPIC"
 
67
+           SHLIB_LD_LIBS='${LIBS}'
 
68
+           SHLIB_SUFFIX=".so"
 
69
+
 
70
+           SHLIB_LD="${CC} -shared"
 
71
+           DL_OBJS="tclLoadDl.o"
 
72
+           DL_LIBS=""
 
73
+           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 
74
+           LD_SEARCH_FLAGS=""
 
75
+           # following line added by CW for Debian GNU/NetBSD
 
76
+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 
77
+           ;;
 
78
+       NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
 
79
            # Not available on all versions:  check for include file.
 
80
            ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 
81
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
 
82
Index: tcl8.4-8.4.15/unix/Makefile.in
 
83
===================================================================
 
84
--- tcl8.4-8.4.15.orig/unix/Makefile.in 2007-05-25 00:40:13.000000000 +0400
 
85
+++ tcl8.4-8.4.15/unix/Makefile.in      2007-05-25 22:55:55.000000000 +0400
 
86
@@ -207,6 +207,7 @@
 
87
 SHLIB_LD               = @SHLIB_LD@
 
88
 SHLIB_CFLAGS           = @SHLIB_CFLAGS@
 
89
 SHLIB_LD_LIBS          = @SHLIB_LD_LIBS@
 
90
+SHLIB_LD_FLAGS         = @SHLIB_LD_FLAGS@
 
91
 TCL_SHLIB_LD_EXTRAS    = @TCL_SHLIB_LD_EXTRAS@
 
92
 
 
93
 SHLIB_SUFFIX           = @SHLIB_SUFFIX@
 
94
Index: tcl8.4-8.4.15/unix/tcl.m4
 
95
===================================================================
 
96
--- tcl8.4-8.4.15.orig/unix/tcl.m4      2007-05-25 00:40:13.000000000 +0400
 
97
+++ tcl8.4-8.4.15/unix/tcl.m4   2007-05-25 22:55:55.000000000 +0400
 
98
@@ -253,6 +253,7 @@
 
99
 #      Subst the following vars:
 
100
 #              TCL_BIN_DIR
 
101
 #              TCL_SRC_DIR
 
102
+#              TCL_INC_DIR
 
103
 #              TCL_LIB_FILE
 
104
 #
 
105
 #------------------------------------------------------------------------
 
106
@@ -313,6 +314,7 @@
 
107
     AC_SUBST(TCL_VERSION)
 
108
     AC_SUBST(TCL_PATCH_LEVEL)
 
109
     AC_SUBST(TCL_BIN_DIR)
 
110
+    AC_SUBST(TCL_INC_DIR)
 
111
     AC_SUBST(TCL_SRC_DIR)
 
112
 
 
113
     AC_SUBST(TCL_LIB_FILE)
 
114
@@ -396,6 +398,7 @@
 
115
     AC_SUBST(TK_VERSION)
 
116
     AC_SUBST(TK_BIN_DIR)
 
117
     AC_SUBST(TK_SRC_DIR)
 
118
+    AC_SUBST(TK_LIB_DIR)
 
119
 
 
120
     AC_SUBST(TK_LIB_FILE)
 
121
     AC_SUBST(TK_LIB_FLAG)
 
122
@@ -896,6 +899,9 @@
 
123
                if test "`uname -s`" = "AIX" ; then
 
124
                    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
 
125
                fi
 
126
+               if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
 
127
+                   tcl_cv_sys_version=NetBSD-Debian
 
128
+               fi
 
129
            fi
 
130
        fi
 
131
     ])
 
132
@@ -1344,12 +1350,15 @@
 
133
            # get rid of the warnings.
 
134
            #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
135
 
 
136
+           # following line added by CW for Debian GNU/Linux
 
137
+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 
138
+
 
139
            if test "$have_dl" = yes; then
 
140
                SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
 
141
                DL_OBJS="tclLoadDl.o"
 
142
                DL_LIBS="-ldl"
 
143
                LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 
144
-               CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 
145
+               CC_SEARCH_FLAGS=""
 
146
                LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
147
            else
 
148
                AC_CHECK_HEADER(dld.h, [
 
149
@@ -1394,17 +1403,20 @@
 
150
            SHLIB_LD_LIBS='${LIBS}'
 
151
            SHLIB_SUFFIX=".so"
 
152
 
 
153
+           # following line added by CW for Debian GNU/Hurd
 
154
+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 
155
+
 
156
            if test "$have_dl" = yes; then
 
157
                SHLIB_LD="${CC} -shared"
 
158
-               DL_OBJS=""
 
159
+               DL_OBJS="tclLoadDl.o"
 
160
                DL_LIBS="-ldl"
 
161
                LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 
162
                CC_SEARCH_FLAGS=""
 
163
-               LD_SEARCH_FLAGS=""
 
164
+               LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
 
165
            else
 
166
                AC_CHECK_HEADER(dld.h, [
 
167
                    SHLIB_LD="ld -shared"
 
168
-                   DL_OBJS=""
 
169
+                   DL_OBJS="tclLoadDld.o"
 
170
                    DL_LIBS="-ldld"
 
171
                    CC_SEARCH_FLAGS=""
 
172
                    LD_SEARCH_FLAGS=""])
 
173
@@ -1446,7 +1458,20 @@
 
174
            CC_SEARCH_FLAGS=""
 
175
            LD_SEARCH_FLAGS=""
 
176
            ;;
 
177
-       NetBSD-*|FreeBSD-[[1-2]].*)
 
178
+       NetBSD-Debian)
 
179
+           SHLIB_CFLAGS="-fPIC"
 
180
+           SHLIB_LD_LIBS='${LIBS}'
 
181
+           SHLIB_SUFFIX=".so"
 
182
+
 
183
+           SHLIB_LD="${CC} -shared"
 
184
+           DL_OBJS="tclLoadDl.o"
 
185
+           DL_LIBS=""
 
186
+           LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 
187
+           LD_SEARCH_FLAGS=""
 
188
+           # following line added by CW for Debian GNU/NetBSD
 
189
+           TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
 
190
+           ;;
 
191
+       NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
 
192
            # Not available on all versions:  check for include file.
 
193
            AC_CHECK_HEADER(dlfcn.h, [
 
194
                # NetBSD/SPARC needs -fPIC, -fpic will not do.