/[gentoo-alt]/trunk/prefix/sys-libs/ncurses/files/ncurses-5.5-gfbsd.patch
Gentoo

Contents of /trunk/prefix/sys-libs/ncurses/files/ncurses-5.5-gfbsd.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 941 - (show annotations) (download)
Sat Dec 31 14:40:17 2005 UTC (8 years, 8 months ago) by grobian
File size: 3060 byte(s)
Synced with mainline tree


1 Index: ncurses-5.5/aclocal.m4
2 ===================================================================
3 --- ncurses-5.5.orig/aclocal.m4
4 +++ ncurses-5.5/aclocal.m4
5 @@ -3507,7 +3507,7 @@ AC_DEFUN([CF_SHARED_OPTS],
6 MK_SHARED_LIB='$(LD) -shared -rdata_shared -soname `basename $[@]` -o $[@]'
7 cf_cv_rm_so_locs=yes
8 ;;
9 - linux*|gnu*|k*bsd*-gnu)
10 + linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
11 if test "$DFT_LWR_MODEL" = "shared" ; then
12 LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
13 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
14 @@ -3523,23 +3523,6 @@ AC_DEFUN([CF_SHARED_OPTS],
15 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
16 MK_SHARED_LIB='$(LD) -Bshareable -soname,`basename $[@].$(ABI_VERSION)` -o $[@]'
17 ;;
18 - freebsd[[45]]*)
19 - CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
20 - MK_SHARED_LIB='$(LD) -Bshareable -soname=`basename $[@]` -o $[@]'
21 - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
22 -
23 -# This doesn't work - I keep getting spurious references to needing
24 -# libncurses.so.5.3 when ldd says it's resolved. LOCAL_LDFLAGS2 seems to be
25 -# no longer used anyway. And the rpath logic isn't relative - so I have to
26 -# add the local and install lib-directories:
27 -#
28 -# if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
29 -# LOCAL_LDFLAGS="-rpath `pwd`/lib"
30 -# LOCAL_LDFLAGS2="-rpath \$(libdir) $LOCAL_LDFLAGS"
31 -# cf_ld_rpath_opt="-rpath "
32 -# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
33 -# fi
34 - ;;
35 openbsd*|freebsd*)
36 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
37 MK_SHARED_LIB='$(LD) -Bshareable -o $[@]'
38 Index: ncurses-5.5/configure
39 ===================================================================
40 --- ncurses-5.5.orig/configure
41 +++ ncurses-5.5/configure
42 @@ -5061,7 +5061,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
43 MK_SHARED_LIB='$(LD) -shared -rdata_shared -soname `basename $@` -o $@'
44 cf_cv_rm_so_locs=yes
45 ;;
46 - linux*|gnu*|k*bsd*-gnu)
47 + linux*|gnu*|k*bsd*-gnu|freebsd*)
48 if test "$DFT_LWR_MODEL" = "shared" ; then
49 LOCAL_LDFLAGS="-Wl,-rpath,`pwd`/lib"
50 LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
51 @@ -5077,23 +5077,6 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
52 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
53 MK_SHARED_LIB='$(LD) -Bshareable -soname,`basename $@.$(ABI_VERSION)` -o $@'
54 ;;
55 - freebsd[45]*)
56 - CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
57 - MK_SHARED_LIB='$(LD) -Bshareable -soname=`basename $@` -o $@'
58 - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
59 -
60 -# This doesn't work - I keep getting spurious references to needing
61 -# libncurses.so.5.3 when ldd says it's resolved. LOCAL_LDFLAGS2 seems to be
62 -# no longer used anyway. And the rpath logic isn't relative - so I have to
63 -# add the local and install lib-directories:
64 -#
65 -# if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
66 -# LOCAL_LDFLAGS="-rpath `pwd`/lib"
67 -# LOCAL_LDFLAGS2="-rpath \$(libdir) $LOCAL_LDFLAGS"
68 -# cf_ld_rpath_opt="-rpath "
69 -# EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
70 -# fi
71 - ;;
72 openbsd*|freebsd*)
73 CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
74 MK_SHARED_LIB='$(LD) -Bshareable -o $@'

  ViewVC Help
Powered by ViewVC 1.1.20