pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/editors/poedit avoid tricking the configure script int...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/632b2ca7f9a1
branches:  trunk
changeset: 474356:632b2ca7f9a1
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Apr 27 21:58:15 2004 +0000

description:
avoid tricking the configure script into thinking we're cross compiling
which breaks compilation if you do not have a cross tool chain installed.
Not sure how this ever compiled before...

diffstat:

 editors/poedit/distinfo         |   4 +++-
 editors/poedit/patches/patch-aa |  36 ++++++++++++++++++++++++++++++++++++
 editors/poedit/patches/patch-ab |  36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletions(-)

diffs (91 lines):

diff -r 2d0bd9099bb6 -r 632b2ca7f9a1 editors/poedit/distinfo
--- a/editors/poedit/distinfo   Tue Apr 27 21:49:57 2004 +0000
+++ b/editors/poedit/distinfo   Tue Apr 27 21:58:15 2004 +0000
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/30 23:20:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/04/27 21:58:15 dmcmahill Exp $
 
 SHA1 (poedit-1.2.5.tar.gz) = 3bcb1009c8687887ae5c53ebebe186bc6c98fb3a
 Size (poedit-1.2.5.tar.gz) = 1313243 bytes
+SHA1 (patch-aa) = b581d7d9c0f8a7e9503da04a4574e9b04a235cb3
+SHA1 (patch-ab) = dade8088c126722a4f83bf92b8db96c6410ed690
diff -r 2d0bd9099bb6 -r 632b2ca7f9a1 editors/poedit/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/poedit/patches/patch-aa   Tue Apr 27 21:58:15 2004 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
+
+--- configure.in.orig  Sun Jan 25 22:16:53 2004
++++ configure.in
+@@ -12,19 +12,19 @@ AC_CANONICAL_TARGET
+ 
+ dnl cross-compiling support: we're cross compiling if the build system is
+ dnl different from the target one (assume host and target be always the same)
+-if test "$build" != "$host" ; then
+-    CC=$host_alias-gcc
+-    CXX=$host_alias-c++
+-    AR=$host_alias-ar
+-    RANLIB=$host_alias-ranlib
+-    DLLTOOL=$host_alias-dlltool
+-    RESCOMP=$host_alias-windres
+-    LD=$host_alias-ld
+-    NM=$host_alias-nm
+-    STRIP=$host_alias-strip
+-else
++#if test "$build" != "$host" ; then
++#    CC=$host_alias-gcc
++#    CXX=$host_alias-c++
++#    AR=$host_alias-ar
++#    RANLIB=$host_alias-ranlib
++#    DLLTOOL=$host_alias-dlltool
++#    RESCOMP=$host_alias-windres
++#    LD=$host_alias-ld
++#    NM=$host_alias-nm
++#    STRIP=$host_alias-strip
++#else
+     RESCOMP=windres
+-fi
++#fi
+ 
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
diff -r 2d0bd9099bb6 -r 632b2ca7f9a1 editors/poedit/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/poedit/patches/patch-ab   Tue Apr 27 21:58:15 2004 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
+
+--- configure.orig     Sun Jan 25 22:17:58 2004
++++ configure
+@@ -1460,19 +1460,19 @@ test -n "$target_alias" &&
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+ 
+-if test "$build" != "$host" ; then
+-    CC=$host_alias-gcc
+-    CXX=$host_alias-c++
+-    AR=$host_alias-ar
+-    RANLIB=$host_alias-ranlib
+-    DLLTOOL=$host_alias-dlltool
+-    RESCOMP=$host_alias-windres
+-    LD=$host_alias-ld
+-    NM=$host_alias-nm
+-    STRIP=$host_alias-strip
+-else
++#if test "$build" != "$host" ; then
++#    CC=$host_alias-gcc
++#    CXX=$host_alias-c++
++#    AR=$host_alias-ar
++#    RANLIB=$host_alias-ranlib
++#    DLLTOOL=$host_alias-dlltool
++#    RESCOMP=$host_alias-windres
++#    LD=$host_alias-ld
++#    NM=$host_alias-nm
++#    STRIP=$host_alias-strip
++#else
+     RESCOMP=windres
+-fi
++#fi
+ 
+ am__api_version="1.7"
+ # Find a good install program.  We prefer a C program (faster),



Home | Main Index | Thread Index | Old Index