From 06fa582130dac08e8c51ba27e2226f7ec7fc29ae Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 19 Aug 1998 12:56:20 +0000 Subject: Patches from Ralf Corsepius and myself to make solaris target buildable. > 1. The ipc check fails since solaris does not define union semun. > The unix port code actually defines this type itself on solaris. Doing > the same thing lets it get configured. Then... > 2. It looks like BSDINSTALL is not defined properly. BSDINSTALL is defined in make/host.cfg.in as BSDINSTALL=@INSTALL@ @INSTALL@ is generated by autoconf's standard macro AC_PROG_INSTALL, which is widely used in almost any autoconf/automake configured package. In case there is really something wrong with it, then it must be considered a bug in autoconf. I can see a doubious fragment in AC_PROG_INSTALL, which is used when no appropriate bsd-install is found. Finally Ralf saw a problem with the find on solaris which I also saw and fixed. --- aclocal.m4 | 10 +++++++++- aclocal/sysv-ipc.m4 | 8 ++++++++ c/Makefile.in | 2 +- c/build-tools/os/msdos/Makefile.in | 2 +- c/build-tools/scripts/Makefile.in | 2 +- c/build-tools/src/Makefile.in | 4 ++-- c/src/exec/score/tools/generic/Makefile.in | 4 ++-- c/src/exec/score/tools/sh/Makefile.in | 4 ++-- c/src/make/host.cfg.in | 1 - c/update-tools/Makefile.in | 6 +++--- configure | 10 +++++++++- make/host.cfg.in | 1 - tools/build/os/msdos/Makefile.in | 2 +- tools/build/scripts/Makefile.in | 2 +- tools/build/src/Makefile.in | 4 ++-- tools/cpu/generic/Makefile.in | 4 ++-- tools/cpu/sh/Makefile.in | 4 ++-- tools/update/Makefile.in | 6 +++--- 18 files changed, 49 insertions(+), 27 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index feb6baec58..ee698ab873 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -461,7 +461,15 @@ AC_TRY_RUN([ #include #include int main () { - union semun arg ; +#if !defined(sun) + union semun arg; +#else + union semun { + int val; + struct semid_ds *buf; + ushort *array; + } arg; +#endif int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); if (id == -1) exit(1); diff --git a/aclocal/sysv-ipc.m4 b/aclocal/sysv-ipc.m4 index 0eb88b3dbc..396dcffbb7 100644 --- a/aclocal/sysv-ipc.m4 +++ b/aclocal/sysv-ipc.m4 @@ -27,7 +27,15 @@ AC_TRY_RUN([ #include #include int main () { +#if !defined(sun) union semun arg ; +#else + union semun { + int val; + struct semid_ds *buf; + ushort *array; + } arg; +#endif int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); if (id == -1) exit(1); diff --git a/c/Makefile.in b/c/Makefile.in index 83f27ac40d..6fd1960f5b 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -51,7 +51,7 @@ CREATE_DIRS = \ # if something is added to TARGET_VARIANTS, then account for it here make_src_makefiles: Makefile.in Makefile -find . -name Makefile \ - -exec grep -q ^preinstall {} \; -print > make_src_makefiles.tmp + -exec grep -l "^preinstall" {} \; > make_src_makefiles.tmp -grep tools make_src_makefiles.tmp > make_src_makefiles -grep -v tools make_src_makefiles.tmp >> make_src_makefiles -rm make_src_makefiles.tmp diff --git a/c/build-tools/os/msdos/Makefile.in b/c/build-tools/os/msdos/Makefile.in index 7321a3a2ea..23a840d33a 100644 --- a/c/build-tools/os/msdos/Makefile.in +++ b/c/build-tools/os/msdos/Makefile.in @@ -20,7 +20,7 @@ INSTALLED=$(DESTDIR)/ifc.exe \ all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) diff --git a/c/build-tools/scripts/Makefile.in b/c/build-tools/scripts/Makefile.in index 2634d61562..afcc980db8 100644 --- a/c/build-tools/scripts/Makefile.in +++ b/c/build-tools/scripts/Makefile.in @@ -25,7 +25,7 @@ INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) diff --git a/c/build-tools/src/Makefile.in b/c/build-tools/src/Makefile.in index 4ba4dfd4a2..52942d909f 100644 --- a/c/build-tools/src/Makefile.in +++ b/c/build-tools/src/Makefile.in @@ -64,7 +64,7 @@ CLOBBER_ADDITIONS += DESTDIR=${PROJECT_RELEASE}/build-tools $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ all: $(ARCH) $(DESTDIR) $(SRCS) $(PGMS) - $(BSDINSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR) + @INSTALL@ $(INSTBINFLAGS) $(PGMS) $(DESTDIR) diff --git a/c/src/exec/score/tools/generic/Makefile.in b/c/src/exec/score/tools/generic/Makefile.in index e5fdec7d7f..4586a43b45 100644 --- a/c/src/exec/score/tools/generic/Makefile.in +++ b/c/src/exec/score/tools/generic/Makefile.in @@ -24,10 +24,10 @@ INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) # Install the program $(DESTDIR)/%: % - $(BSDINSTALL) $(INSTBINFLAGS) $^ $@ + @INSTALL@ $(INSTBINFLAGS) $^ $@ diff --git a/c/src/exec/score/tools/sh/Makefile.in b/c/src/exec/score/tools/sh/Makefile.in index c35743adea..cbda87fbd8 100644 --- a/c/src/exec/score/tools/sh/Makefile.in +++ b/c/src/exec/score/tools/sh/Makefile.in @@ -55,8 +55,8 @@ ${PGMS}: $(OBJS) $(LINK_FILES) $(make-exe) $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ # Install the program install: $(DESTDIR) $(PGMS) - $(BSDINSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR) + @INSTALL@ $(INSTBINFLAGS) ${PGMS} $(DESTDIR) diff --git a/c/src/make/host.cfg.in b/c/src/make/host.cfg.in index a68a1b2faf..0c8f9cf408 100644 --- a/c/src/make/host.cfg.in +++ b/c/src/make/host.cfg.in @@ -30,7 +30,6 @@ CHMOD=@CHMOD@ SED=@SED@ M4=@M4@ -BSDINSTALL=@INSTALL@ INSTALL=$(PROJECT_TOOLS)/install-if-change INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)" diff --git a/c/update-tools/Makefile.in b/c/update-tools/Makefile.in index e558bd4b37..142bece1f1 100644 --- a/c/update-tools/Makefile.in +++ b/c/update-tools/Makefile.in @@ -26,7 +26,7 @@ INSTALLED=$(INSTALL_LIST:%=$(DESTDIR)/%) all: $(DESTDIR) $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) @@ -34,5 +34,5 @@ install: $(INSTALLED) # FIXME: This isn't correct $(DESTDIR)/%: % $(make-script) - $(BSDINSTALL) $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR} - $(BSDINSTALL) $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR} + @INSTALL@ $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR} + @INSTALL@ $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR} diff --git a/configure b/configure index 0a569872be..db08992ac5 100644 --- a/configure +++ b/configure @@ -2743,7 +2743,15 @@ else #include #include int main () { - union semun arg ; +#if !defined(sun) + union semun arg; +#else + union semun { + int val; + struct semid_ds *buf; + ushort *array; + } arg; +#endif int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); if (id == -1) exit(1); diff --git a/make/host.cfg.in b/make/host.cfg.in index a68a1b2faf..0c8f9cf408 100644 --- a/make/host.cfg.in +++ b/make/host.cfg.in @@ -30,7 +30,6 @@ CHMOD=@CHMOD@ SED=@SED@ M4=@M4@ -BSDINSTALL=@INSTALL@ INSTALL=$(PROJECT_TOOLS)/install-if-change INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)" diff --git a/tools/build/os/msdos/Makefile.in b/tools/build/os/msdos/Makefile.in index 7321a3a2ea..23a840d33a 100644 --- a/tools/build/os/msdos/Makefile.in +++ b/tools/build/os/msdos/Makefile.in @@ -20,7 +20,7 @@ INSTALLED=$(DESTDIR)/ifc.exe \ all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) diff --git a/tools/build/scripts/Makefile.in b/tools/build/scripts/Makefile.in index 2634d61562..afcc980db8 100644 --- a/tools/build/scripts/Makefile.in +++ b/tools/build/scripts/Makefile.in @@ -25,7 +25,7 @@ INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) diff --git a/tools/build/src/Makefile.in b/tools/build/src/Makefile.in index 4ba4dfd4a2..52942d909f 100644 --- a/tools/build/src/Makefile.in +++ b/tools/build/src/Makefile.in @@ -64,7 +64,7 @@ CLOBBER_ADDITIONS += DESTDIR=${PROJECT_RELEASE}/build-tools $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ all: $(ARCH) $(DESTDIR) $(SRCS) $(PGMS) - $(BSDINSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR) + @INSTALL@ $(INSTBINFLAGS) $(PGMS) $(DESTDIR) diff --git a/tools/cpu/generic/Makefile.in b/tools/cpu/generic/Makefile.in index e5fdec7d7f..4586a43b45 100644 --- a/tools/cpu/generic/Makefile.in +++ b/tools/cpu/generic/Makefile.in @@ -24,10 +24,10 @@ INSTALLED=$(PGMS:%=$(DESTDIR)/%) all: $(DESTDIR) $(PGMS) install $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) # Install the program $(DESTDIR)/%: % - $(BSDINSTALL) $(INSTBINFLAGS) $^ $@ + @INSTALL@ $(INSTBINFLAGS) $^ $@ diff --git a/tools/cpu/sh/Makefile.in b/tools/cpu/sh/Makefile.in index c35743adea..cbda87fbd8 100644 --- a/tools/cpu/sh/Makefile.in +++ b/tools/cpu/sh/Makefile.in @@ -55,8 +55,8 @@ ${PGMS}: $(OBJS) $(LINK_FILES) $(make-exe) $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ # Install the program install: $(DESTDIR) $(PGMS) - $(BSDINSTALL) $(INSTBINFLAGS) ${PGMS} $(DESTDIR) + @INSTALL@ $(INSTBINFLAGS) ${PGMS} $(DESTDIR) diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in index e558bd4b37..142bece1f1 100644 --- a/tools/update/Makefile.in +++ b/tools/update/Makefile.in @@ -26,7 +26,7 @@ INSTALLED=$(INSTALL_LIST:%=$(DESTDIR)/%) all: $(DESTDIR) $(DESTDIR): - $(BSDINSTALL) $(INSTDIRFLAGS) $@ + @INSTALL@ $(INSTDIRFLAGS) $@ install: $(INSTALLED) @@ -34,5 +34,5 @@ install: $(INSTALLED) # FIXME: This isn't correct $(DESTDIR)/%: % $(make-script) - $(BSDINSTALL) $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR} - $(BSDINSTALL) $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR} + @INSTALL@ $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR} + @INSTALL@ $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR} -- cgit v1.2.3