Solaris2.6 portability.

CVS patchset: 3591
CVS date: 2000/02/27 18:52:30

Makefile.am

@@ -78,6 +78,8 @@ install-data-local:
 	esac
 	@case "@build_os@" in \
 	mint) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/m68kmint ;;\
+	linux*) DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ; \
+	   $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/@build_cpu@ ;;\
 	*) $(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/@build_cpu@ ;;\
 	esac
 	@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/RPMS/noarch
@@ -85,7 +87,6 @@ install-data-local:
 	@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SPECS
 	@$(mkinstalldirs) $(DESTDIR)/$(prefix)/src/redhat/SRPMS
 	@$(mkinstalldirs) $(DESTDIR)/var/tmp
-	./installplatform ./rpmrc ./macros ./platform
 
 .PHONY: tar
 tar:

build/build.c

@@ -107,7 +107,7 @@ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test)
     }
     
     if (makeTempFile(rootURL, &scriptName, &fd) || fd == NULL || Ferror(fd)) {
-	rpmError(RPMERR_SCRIPT, _("Unable to open temp file"));
+	rpmError(RPMERR_SCRIPT, _("Unable to open temp file %s."), scriptName);
 	rc = RPMERR_SCRIPT;
 	goto exit;
     }

build/pack.c

@@ -309,7 +309,7 @@ int writeRPM(Header h, const char *fileName, int type,
     
     /* Write the header */
     if (makeTempFile(NULL, &sigtarget, &fd)) {
-	rpmError(RPMERR_CREATE, _("Unable to open temp file"));
+	rpmError(RPMERR_CREATE, _("Unable to open temp file %s."), sigtarget);
 	return RPMERR_CREATE;
     }
 

installplatform

@@ -13,24 +13,29 @@ include:	$RPMRC
 macrofiles:	$MACROS
 E_O_F
 
-RPM="rpm --rcfile $TEMPRC"
+RPM="./rpm --rcfile $TEMPRC"
 
-ARCH="$($RPM --eval '%{_arch}')"
-VENDOR="$($RPM --eval '%{_vendor}')"
-OS="$($RPM --eval '%{_os}')"
-TARGET="$($RPM --eval '%{_target}')"
+ARCH="`$RPM --eval '%{_arch}'`"
+VENDOR="`$RPM --eval '%{_vendor}'`"
+OS="`$RPM --eval '%{_os}'`"
+TARGET_PLATFORM="`$RPM --eval '%{_target_platform}'`"
+TARGET="`$RPM --eval '%{_target}'`"
 
 PPD="${DESTDIR}/${pkglibdir}/${ARCH}-${VENDOR}-${OS}"
 
 [ -d $PPD ] || mkdir $PPD
 
-RPMRC_OPTFLAGS="$($RPM --eval '%{optflags}')"
-RPMRC_OPTFLAGS="$(echo $RPMRC_OPTFLAGS | sed -e 's, ,\ ,g')"
+RPMRC_OPTFLAGS="`$RPM --eval '%{optflags}'`"
+RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e 's, ,\ ,g'`"
 
-cat $PLATFORM |
-    sed	-e s,\\\$\{,\%\{_, \
-	-e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," > ${PPD}/macros
 
-ln -sf ${PPD} ${TARGET}
+cat $PLATFORM | \
+  sed -e s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS, -e 's,\${,%{_,' \
+> ${PPD}/macros
+
+#
+# Better try to create these too until the smoke clears. Yuck.
+[ "${ARCH}-${VENDOR}-${OS}" = "${TARGET}" ] || ln -sf ${ARCH}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/${TARGET}
+[ "${ARCH}-${VENDOR}-${OS}" = "${TARGET_PLATFORM}" ] || ln -sf ${ARCH}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/${TARGET_PLATFORM}
 
 rm $TEMPRC

rpm.c

@@ -142,7 +142,9 @@ static struct poptOption optionsTable[] = {
  { "nodeps", '\0', 0, &noDeps, 0,		NULL, NULL},
  { "nodirtokens", '\0', POPT_ARG_VAL, &_noDirTokens, 1,	NULL, NULL},
  { "nogpg", '\0', 0, &noGpg, 0,			NULL, NULL},
- { "nolibio", '\0', 0, &noLibio, 0,		NULL, NULL},
+#if HAVE_LIBIO_H
+ { "nolibio", '\0', POPT_ARG_VAL, &noLibio, 1,		NULL, NULL},
+#endif
  { "nomd5", '\0', 0, &noMd5, 0,			NULL, NULL},
  { "noorder", '\0', 0, &noOrder, 0,		NULL, NULL},
  { "nopgp", '\0', 0, &noPgp, 0,			NULL, NULL},
@@ -595,7 +597,11 @@ int main(int argc, const char ** argv)
     justdb = 0;
     noDeps = 0;
     noGpg = 0;
+#if HAVE_LIBIO_H
     noLibio = 0;
+#else
+    noLibio = 1;
+#endif
     noMd5 = 0;
     noOrder = 0;
     noPgp = 0;