diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 11:00:44 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 11:00:44 +0000 |
| commit | 22586092474a75f63337026fcfaa25701ad5b872 (patch) | |
| tree | 68d44a6ca2c400a64d08ea23f23354ceebab0ae7 /packages/gcc/gcc-4.3.0/debian/libobjc-gc-link.dpatch | |
| parent | acb6fa33fccf7196c86a3a28f927d4fa441d05eb (diff) | |
| parent | 907c2d35eb8bb9f592909eb017820b7a8fe62ec6 (diff) | |
merge of 'acd40ed8d57971494f1b3dea27c1e5c3ab6b2a7f'
and 'ff7245ddafaf0bcb4c4a73dea132994953a8ff8c'
Diffstat (limited to 'packages/gcc/gcc-4.3.0/debian/libobjc-gc-link.dpatch')
| -rw-r--r-- | packages/gcc/gcc-4.3.0/debian/libobjc-gc-link.dpatch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/packages/gcc/gcc-4.3.0/debian/libobjc-gc-link.dpatch b/packages/gcc/gcc-4.3.0/debian/libobjc-gc-link.dpatch new file mode 100644 index 0000000000..87cb742c77 --- /dev/null +++ b/packages/gcc/gcc-4.3.0/debian/libobjc-gc-link.dpatch @@ -0,0 +1,73 @@ +#! /bin/sh -e + +# DP: Link libobjc_gc with libgcjgc_convenience.la. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + cd ${dir}libobjc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f ${dir}libobjc/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +2008-02-06 Matthias Klose <doko@ubuntu.com> + + * configure.ac (OBJC_BOEHM_GC_LIBS): Link with libgcjgc_convenience.la. + * configure: Regenerate. + * Makefile.in (libobjc_gc$(libsuffix).la): Link with OBJC_BOEHM_GC_LIBS. + +--- libobjc/Makefile.in~ 2007-07-05 10:18:52.000000000 +0200 ++++ libobjc/Makefile.in 2008-02-07 17:17:17.243167905 +0100 +@@ -95,6 +95,7 @@ + OBJC_THREAD_FILE=thr-objc + OBJC_BOEHM_GC=@OBJC_BOEHM_GC@ + OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@ ++OBJC_BOEHM_GC_LIBS=@OBJC_BOEHM_GC_LIBS@ + + INCLUDES = -I$(srcdir)/objc -I$(srcdir)/$(MULTISRCTOP)../gcc \ + -I$(srcdir)/$(MULTISRCTOP)../gcc/config \ +@@ -281,6 +282,7 @@ + + libobjc_gc$(libsuffix).la: $(OBJS_GC) + $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \ ++ $(OBJC_BOEHM_GC_LIBS) \ + -rpath $(toolexeclibdir) \ + -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) + +--- libobjc/configure.ac~ 2007-10-19 15:14:58.000000000 +0200 ++++ libobjc/configure.ac 2008-02-07 17:25:15.750386077 +0100 +@@ -66,15 +66,18 @@ + no) + OBJC_BOEHM_GC='' + OBJC_BOEHM_GC_INCLUDES='' ++ OBJC_BOEHM_GC_LIBS='' + ;; + *) + OBJC_BOEHM_GC=libobjc_gc.la + OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' ++ OBJC_BOEHM_GC_LIBS='../boehm-gc/libgcjgc_convenience.la -pthread' + ;; + esac], + [OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES='']) + AC_SUBST(OBJC_BOEHM_GC) + AC_SUBST(OBJC_BOEHM_GC_INCLUDES) ++AC_SUBST(OBJC_BOEHM_GC_LIBS) + + # ----------- + # Directories + |