kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/editors/emacs24/patches/patch-ab
ryoon 8cf6375a1a Bump PKGREVISON. 
* Fix build with giflib 5.0.4.
2013-07-05 13:33:40 +00:00

226 lines
6.5 KiB
Text
Raw Blame History

$NetBSD: patch-ab,v 1.8 2013/07/05 13:33:40 ryoon Exp $
* Add DragonFly
* Fix giflib 5.0 build.
--- configure.orig 2013-03-08 08:13:36.000000000 +0000
+++ configure
@@ -4539,6 +4539,15 @@ case "${canonical}" in
opsys=netbsd
;;
+ ## DragonFly ports
+ *-*-dragonfly*)
+ opsys=dragonfly
+ case "${canonical}" in
+ i[3456]86-*-dragonfly*) machine=intel386 ;;
+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
+ esac
+ ;;
+
## OpenBSD ports
*-*-openbsd* )
opsys=openbsd
@@ -8251,7 +8260,7 @@ esac
LD_SWITCH_SYSTEM=
case "$opsys" in
- freebsd)
+ dragonfly|freebsd)
## Let `ld' find image libs and similar things in /usr/local/lib.
## The system compiler, GCC, has apparently been modified to not
## look there, contrary to what a stock GCC would do.
@@ -8341,7 +8350,7 @@ case "$opsys" in
## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
- freebsd) LIBS_SYSTEM="-lutil" ;;
+ freebsd|netbsd|openbsd|dragonfly) LIBS_SYSTEM="-lutil" ;;
hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
@@ -8382,6 +8391,11 @@ case $opsys in
LIB_MATH=
START_FILES='pre-crt0.o'
;;
+ dragonfly )
+ # This base version is appended below
+ LIB_STANDARD='-lc $(CRT_DIR)/crtn.o'
+ START_FILES='$(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
+ ;;
freebsd )
LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtn.o'
START_FILES='pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o'
@@ -8508,6 +8522,51 @@ fi # crt_fi
case $opsys in
+ dragonfly )
+ if test "x${GCC}" = xyes ; then
+ libgcc_file=`$CC --print-libgcc-file-name 2>/dev/null`
+ case "$libgcc_file" in
+ */*)
+ crt_gcc_subdir=`$as_dirname -- "$libgcc_file" ||
+$as_expr X"$libgcc_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$libgcc_file" : 'X\(//\)[^/]' \| \
+ X"$libgcc_file" : 'X\(//\)$' \| \
+ X"$libgcc_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$libgcc_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ ;;
+ *)
+ as_fn_error $? "Cannot determine CRT $CC subdirectory." "$LINENO" 5
+ ;;
+ esac
+ for f in crtbegin.o crtend.o; do
+ if test ! -f $crt_gcc_subdir/$f; then
+ as_fn_error $? "Required file not found: $f" "$LINENO" 5
+ fi
+ done
+ LIB_STANDARD="$crt_gcc_subdir/crtend.o $LIB_STANDARD"
+ START_FILES="$START_FILES $crt_gcc_subdir/crtbegin.o"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Correct CRT file list unknown for ${CC}." >&5
+$as_echo "$as_me: WARNING: Correct CRT file list unknown for ${CC}." >&2;}
+ fi
+ ;;
netbsd | openbsd )
if test -f $CRT_DIR/crti.o; then
@@ -12766,8 +12825,8 @@ if test "${HAVE_X11}" = "yes" && test "$
if test "x$ac_cv_header_gif_lib_h" = xyes; then :
# EGifPutExtensionLast only exists from version libungif-4.1.0b1.
# Earlier versions can crash Emacs.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
-$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionTrailer in -lgif" >&5
+$as_echo_n "checking for EGifPutExtensionTrailer in -lgif... " >&6; }
if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -12782,11 +12841,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
-char EGifPutExtensionLast ();
+char EGifPutExtensionTrailer ();
int
main ()
{
-return EGifPutExtensionLast ();
+return EGifPutExtensionTrailer ();
;
return 0;
}
@@ -13404,7 +13463,7 @@ mail_lock=no
case "$opsys" in
aix4-2) mail_lock="lockf" ;;
- gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
+ gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
## On GNU/Linux systems, both methods are used by various mail programs.
## I assume most people are using newer mailers that have heard of flock.
@@ -13770,6 +13829,11 @@ case "$opsys" in
## option to use it.
darwin) LIBS_TERMCAP="-lncurses" ;;
+ dragonfly)
+ TERMINFO=yes
+ LIBS_TERMCAP="-lncurses"
+ ;;
+
gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;;
freebsd)
@@ -15195,7 +15259,7 @@ $as_echo "#define HAVE_PROCFS 1" >>confd
esac
case $opsys in
- darwin | freebsd | netbsd | openbsd )
+ darwin | dragonfly | freebsd | netbsd | openbsd )
$as_echo "#define DONT_REOPEN_PTY 1" >>confdefs.h
@@ -15277,7 +15341,7 @@ case $opsys in
;;
- gnu-linux | gnu-kfreebsd | freebsd | netbsd )
+ gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
if test "x$ac_cv_func_grantpt" = xyes; then
$as_echo "#define UNIX98_PTYS 1" >>confdefs.h
@@ -15356,7 +15420,7 @@ esac
case $opsys in
- aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
+ aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
$as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
;;
@@ -15514,6 +15578,11 @@ else
;;
+ dragonfly)
+ $as_echo "#define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)" >>confdefs.h
+
+ ;;
+
unixware)
$as_echo "#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)" >>confdefs.h
@@ -15572,7 +15641,7 @@ case $opsys in
darwin) $as_echo "#define TAB3 OXTABS" >>confdefs.h
;;
- gnu | freebsd | netbsd | openbsd )
+ gnu | dragonfly | freebsd | netbsd | openbsd )
$as_echo "#define TABDLY OXTABS" >>confdefs.h
@@ -15687,7 +15756,7 @@ if test x$GCC = xyes; then
else
case $opsys in
- freebsd | netbsd | openbsd | irix6-5 | sol2* )
+ dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
$as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h
;;
@@ -15844,7 +15913,7 @@ $as_echo "#define BSD_SYSTEM_AHB 1" >>co
;;
- gnu | netbsd | openbsd )
+ gnu | dragonfly | netbsd | openbsd )
$as_echo "#define BSD4_2 /**/" >>confdefs.h
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24713,7 +24782,7 @@ LIB_GCC=
if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
case "$opsys" in
- freebsd|netbsd|openbsd) LIB_GCC= ;;
+ dragonfly|freebsd|netbsd|openbsd) LIB_GCC= ;;
gnu-*)
## armin76@gentoo.org reported that the lgcc_s flag is necessary to
Reference in a new issue View git blame Copy permalink