From f369dd9a00cfe24de5d59a7bbc741595b33c547b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sun, 26 Mar 2000 16:45:32 -0800
Subject: [PATCH] some fixes for freebsd and hp-ux
Rev: bin/export.pike:1.30
Rev: bin/install.pike:1.49
Rev: src/configure.in:1.354
---
bin/export.pike | 30 +++++++++++++++++++++++++++---
bin/install.pike | 15 +++++++++++----
src/configure.in | 14 +++++++++++---
3 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/bin/export.pike b/bin/export.pike
index 68851ca3d2..0f309382ff 100755
--- a/bin/export.pike
+++ b/bin/export.pike
@@ -1,6 +1,6 @@
#!/usr/local/bin/pike
-/* $Id: export.pike,v 1.29 1999/09/10 00:08:43 hubbe Exp $ */
+/* $Id: export.pike,v 1.30 2000/03/27 00:45:25 hubbe Exp $ */
#include <simulate.h>
import Stdio;
@@ -203,8 +203,32 @@ int main(int argc, string *argv)
werror("Creating "+vpath+"-indigo.tar.gz:\n");
object o=Stdio.File();
- spawn("tar cvf - "+files*" ",0,o->pipe(Stdio.PROP_IPC));
- spawn("gzip -9",o,Stdio.File(pike_base_name+"/"+vpath+"-indigo.tar.gz","wct"))->wait();
+
+ int first=1;
+ foreach(files/50,files)
+ {
+ if(Process.create_process(({"tar",
+ first?"cvf":"rvf",
+ pike_base_name+"/"+vpath+"-indigo.tar"
+ })+files)->wait())
+ {
+ werror("Tar file creation failed!\n");
+ if(cvs) cvs->wait();
+ exit(1);
+ }
+ first=0;
+ }
+
+ if(Process.create_process(({"gzip",
+ "-9",
+ pike_base_name+"/"+vpath+"-indigo.tar"
+})
+ )->wait())
+ {
+ werror("Gzip failed!\n");
+ if(cvs) cvs->wait();
+ exit(1);
+ }
rm(vpath);
werror("Done.\n");
diff --git a/bin/install.pike b/bin/install.pike
index 38d5d3754d..b36e42e8d8 100644
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -511,10 +511,17 @@ done
});
- status("Creating",tmpname+".tar");
-
- Process.create_process(({"tar","cf",tmpname+".tar"})+ to_export)
- ->wait();
+ string tmpmsg=".";
+
+ string tararg="cf";
+ foreach(to_export/50, array files_to_tar)
+ {
+ status("Creating",tmpname+".tar",tmpmsg);
+ tmpmsg+=".";
+ Process.create_process(({"tar",tararg,tmpname+".tar"})+ to_export)
+ ->wait();
+ tararg="rf";
+ }
status("Creating",tmpname+".tar.gz");
diff --git a/src/configure.in b/src/configure.in
index 145fe2264a..988463d4ac 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.353 2000/03/26 20:57:27 hubbe Exp $")
+AC_REVISION("$Id: configure.in,v 1.354 2000/03/27 00:45:32 hubbe Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -1367,8 +1367,16 @@ int main(int argc, char **argv)
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- CFLAGS="${CFLAGS} -pthread"
- LD_FALLBACK_FLAGS="${LD_FALLBACK_FLAGS-} -lc_r"
+
+ AC_PATH_PROG(PTHREAD_CONFIG,pthread-config,no)
+ if [ "x$PTHREAD_CONFIG" = xno ]; then
+ CFLAGS="${CFLAGS} -pthread"
+ LD_FALLBACK_FLAGS="${LD_FALLBACK_FLAGS-} -lc_r"
+ else
+ CFLAGS="$CFLAGS `pthread-config --cflags`"
+ LIBS="$LIBS `pthread-config --libs`"
+ LDFLAGS="$CFLAGS `pthread-config --ldflags`"
+ fi
fi
;;
--
GitLab