diff options
author | rh <rh@pkgsrc.org> | 2000-10-01 14:03:27 +0000 |
---|---|---|
committer | rh <rh@pkgsrc.org> | 2000-10-01 14:03:27 +0000 |
commit | a6361d0a69ad0445a5bd51aedec3b56bb927a5c1 (patch) | |
tree | 927449254f7f705ff2911828b2e03c924e5cc183 /graphics | |
parent | 1c8f8eba167fbbe2b32337b337c3bd2a97bba164 (diff) | |
download | pkgsrc-a6361d0a69ad0445a5bd51aedec3b56bb927a5c1.tar.gz |
Add runtime library search patch.
Make this compile under NetBSD-1.4.x by moving conflicting definition in
#include <unistd.h> upfront.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/libggi/files/patch-sum | 4 | ||||
-rw-r--r-- | graphics/libggi/patches/patch-ab | 46 | ||||
-rw-r--r-- | graphics/libggi/patches/patch-ac | 21 |
3 files changed, 70 insertions, 1 deletions
diff --git a/graphics/libggi/files/patch-sum b/graphics/libggi/files/patch-sum index 1fb79944486..19ad8739620 100644 --- a/graphics/libggi/files/patch-sum +++ b/graphics/libggi/files/patch-sum @@ -1,3 +1,5 @@ -$NetBSD: patch-sum,v 1.1 2000/04/16 16:58:03 mycroft Exp $ +$NetBSD: patch-sum,v 1.2 2000/10/01 14:03:27 rh Exp $ MD5 (patch-aa) = 1ca82ea3c003d7f5766eeaf14761f623 +MD5 (patch-ab) = d63d8d81004ce6a99a78a994148b9b6e +MD5 (patch-ac) = 6e55e8b06a168213f2aea14516f69fa5 diff --git a/graphics/libggi/patches/patch-ab b/graphics/libggi/patches/patch-ab new file mode 100644 index 00000000000..3fa85c1931f --- /dev/null +++ b/graphics/libggi/patches/patch-ab @@ -0,0 +1,46 @@ +$NetBSD: patch-ab,v 1.1 2000/10/01 14:03:27 rh Exp $ + +--- ltmain.sh.orig Thu Apr 1 03:11:12 1999 ++++ ltmain.sh +@@ -794,6 +794,7 @@ + old_convenience= + deplibs= + linkopts= ++ wllinkopts= + lib_search_path=`pwd` + + avoid_version=no +@@ -1105,6 +1106,25 @@ + continue + ;; + ++ -Wl,*) ++ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` ++ arg= ++ IFS="${IFS= }"; save_ifs="$IFS"; IFS=',' ++ for flag in $args; do ++ IFS="$save_ifs" ++ case "$flag" in ++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") ++ flag="\"$flag\"" ++ ;; ++ esac ++ arg="$arg $wl$flag" ++ linkopts="$linkopts $flag" ++ wllinkopts="$wllinkopts $wl$flag" ++ done ++ IFS="$save_ifs" ++ arg=`$echo "X$arg" | $Xsed -e "s/^ //"` ++ ;; ++ + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +@@ -2244,6 +2264,7 @@ + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + linkopts="$linkopts $flag" ++ wllinkopts="$linkopts $wl$flag" + fi + + # Prepare the list of exported symbols diff --git a/graphics/libggi/patches/patch-ac b/graphics/libggi/patches/patch-ac new file mode 100644 index 00000000000..ea8dd94497c --- /dev/null +++ b/graphics/libggi/patches/patch-ac @@ -0,0 +1,21 @@ +$NetBSD: patch-ac,v 1.1 2000/10/01 14:03:27 rh Exp $ + +--- display/xf86dga/XF86DGA.c.orig Tue Apr 13 00:57:20 1999 ++++ display/xf86dga/XF86DGA.c +@@ -6,6 +6,8 @@ + + */ + ++#include <unistd.h> ++ + /* THIS IS NOT AN X CONSORTIUM STANDARD */ + + /* Defines */ +@@ -283,7 +285,6 @@ + #include <X11/Xmd.h> + #include <stdlib.h> + #include <stdio.h> +-#include <unistd.h> + #include <fcntl.h> + #if defined(ISC) + # define HAS_SVR3_MMAP |