[Debian-astro-commits] [xpa] 02/03: Use Tcl stubs

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository xpa.

commit ac8540abec538c39480be1bdf93229726d973234
Author: Ole Streicher <ole at aip.de>
Date:   Mon Jun 6 11:31:53 2016 +0200

    Use Tcl stubs
---
 debian/changelog                    |  1 +
 debian/patches/hardening.patch      |  4 ++--
 debian/patches/install_tclxpa.patch | 19 ++++++++++++++++---
 debian/patches/sort_o_files         |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e493d37..c8fbe80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xpa (2.1.17-6) UNRELEASED; urgency=medium
 
   * Use autoreconf
+  * Use Tcl stubs
 
  -- Ole Streicher <olebole at debian.org>  Mon, 06 Jun 2016 11:31:21 +0200
 
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
index dcaede3..6bdece3 100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@ -24,8 +24,8 @@ Description: Add hardening flags
  		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
  		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
  		CC='$(CC)' CXX='$(CXX)' \
--		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
-+		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
+-		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o -ltclstub; \
++		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o -ltclstub; \
  		rm -rf $(PACKAGE)tmp; )
  
  diff:
diff --git a/debian/patches/install_tclxpa.patch b/debian/patches/install_tclxpa.patch
index 00430d3..e89b259 100644
--- a/debian/patches/install_tclxpa.patch
+++ b/debian/patches/install_tclxpa.patch
@@ -1,6 +1,6 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
- Debians policy.
+ Debians policy. Also use Tcl stubs.
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -38,6 +38,7 @@
@@ -42,7 +42,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
 -		test -r libtclxpa.dylib && cp -p libtclxpa.dylib libtclxpa.so && echo "copying libtclxpa.dylib to libtclxpa.so"; \
 -		rm -rf libtclxpa.tmp)
 +
-+tclxpa:		$(TCL_OBJS) 
++tclxpa:		$(TCL_OBJS)
 +		ar cruv libtclxpa.a $(TCL_OBJS)
 +		$(RANLIB) libtclxpa.a
 +
@@ -50,7 +50,7 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
 +		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
 +		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
 +		CC='$(CC)' CXX='$(CXX)' \
-+		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
++		./mklib -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o -ltclstub; \
 +		rm -rf $(PACKAGE)tmp; )
  
  diff:
@@ -76,3 +76,16 @@ Description: Install the tcl interface to /usr/lib/tcltk/xpa according to
  install-binaries: $(LIB) $(PROGS)
  	@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
+@@ -397,10 +408,10 @@
+ 		$(CC) -c $(CC_SWITCHES) port.c
+ 
+ tcl.o:		tcl.c $(INCL)
+-		$(CC) -c $(CC_SWITCHES) $(TCL_CFLAGS) tcl.c
++		$(CC) -c $(CC_SWITCHES) $(TCL_CFLAGS) -DUSE_TCL_STUBS=1 tcl.c
+ 
+ tclloop.o:	tclloop.c $(INCL)
+-		$(CC) -c $(CC_SWITCHES) $(TCL_CFLAGS) tclloop.c
++		$(CC) -c $(CC_SWITCHES) $(TCL_CFLAGS) -DUSE_TCL_STUBS=1 tclloop.c
+ 
+ gtkloop.o:	gtkloop.c $(INCL)
+ 		$(CC) -c $(CC_SWITCHES) $(GTK_CFLAGS) gtkloop.c
diff --git a/debian/patches/sort_o_files b/debian/patches/sort_o_files
index 59af457..27ff37b 100644
--- a/debian/patches/sort_o_files
+++ b/debian/patches/sort_o_files
@@ -17,8 +17,8 @@ Author: Alexis Bienvenüe <pado at passoire.fr>
  		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
  		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
  		CC='$(CC)' CXX='$(CXX)' \
--		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
-+		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa `LC_ALL=C ls $(PACKAGE)tmp/*.o` $(TCL_LIBS); \
+-		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o -ltclstub; \
++		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa `LC_ALL=C ls $(PACKAGE)tmp/*.o` -ltclstub; \
  		rm -rf $(PACKAGE)tmp; )
  
  diff:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/xpa.git