From f8d79456d5ee518fae8d8c89039c313edd7a6885 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2021 13:53:24 +0000 Subject: import uuid-1.6.2-53.el9 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0050fbc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/uuid-1.6.2.tar.gz diff --git a/.uuid.metadata b/.uuid.metadata new file mode 100644 index 0000000..808fb23 --- /dev/null +++ b/.uuid.metadata @@ -0,0 +1 @@ +3e22126f0842073f4ea6a50b1f59dcb9d094719f SOURCES/uuid-1.6.2.tar.gz diff --git a/SOURCES/uuid-1.6.1-mkdir.patch b/SOURCES/uuid-1.6.1-mkdir.patch new file mode 100644 index 0000000..89e230c --- /dev/null +++ b/SOURCES/uuid-1.6.1-mkdir.patch @@ -0,0 +1,11 @@ +diff -up uuid-1.6.2/pgsql/Makefile.mkdir uuid-1.6.2/pgsql/Makefile +--- uuid-1.6.2/pgsql/Makefile.mkdir 2011-03-03 15:12:12.000000000 +0000 ++++ uuid-1.6.2/pgsql/Makefile 2011-03-03 16:15:45.000000000 +0000 +@@ -16,6 +16,7 @@ PG_CONFIG ?= pg_config + PGXS := $(shell $(PG_CONFIG) --pgxs) + POSTGRES := $(shell $(PG_CONFIG) --bindir)/postgres + top_builddir := $(dir $(PGXS))../.. ++mkinstalldirs = ../shtool mkdir -p + include $(top_builddir)/src/Makefile.global + + NAME = ossp-uuid diff --git a/SOURCES/uuid-1.6.1-ossp.patch b/SOURCES/uuid-1.6.1-ossp.patch new file mode 100644 index 0000000..c0c7d57 --- /dev/null +++ b/SOURCES/uuid-1.6.1-ossp.patch @@ -0,0 +1,207 @@ +diff -up uuid-1.6.1/uuid-config.in.BAD uuid-1.6.1/uuid-config.in +--- uuid-1.6.1/uuid-config.in.BAD 2008-03-06 11:56:13.000000000 -0500 ++++ uuid-1.6.1/uuid-config.in 2008-03-06 11:56:25.000000000 -0500 +@@ -121,7 +121,7 @@ do + output_extra="$output_extra $uuid_ldflags" + ;; + --libs) +- output="$output -luuid" ++ output="$output -lossp-uuid" + output_extra="$output_extra $uuid_libs" + ;; + * ) +diff -up uuid-1.6.1/Makefile.in.BAD uuid-1.6.1/Makefile.in +--- uuid-1.6.1/Makefile.in.BAD 2008-03-06 11:10:13.000000000 -0500 ++++ uuid-1.6.1/Makefile.in 2008-03-06 11:11:39.000000000 -0500 +@@ -62,13 +62,13 @@ PERL = @PERL@ + PHP = @PHP@ + PG_CONFIG = @PG_CONFIG@ + +-LIB_NAME = libuuid.la ++LIB_NAME = libossp-uuid.la + LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo + +-DCE_NAME = libuuid_dce.la ++DCE_NAME = libossp-uuid_dce.la + DCE_OBJS = uuid_dce.lo $(LIB_OBJS) + +-CXX_NAME = libuuid++.la ++CXX_NAME = libossp-uuid++.la + CXX_OBJS = uuid++.lo $(LIB_OBJS) + + PRG_NAME = uuid +@@ -79,10 +79,10 @@ MAN_NAME = uuid.3 uuid++.3 uuid.1 + PERL_NAME = $(S)/perl/blib/lib/OSSP/uuid.pm + PERL_OBJS = $(S)/perl/uuid.pm + +-PHP_NAME = $(S)/php/modules/uuid.so ++PHP_NAME = $(S)/php/modules/ossp-uuid.so + PHP_OBJS = $(S)/php/uuid.c + +-PGSQL_NAME = $(S)/pgsql/libuuid.so ++PGSQL_NAME = $(S)/pgsql/libossp-uuid.so + PGSQL_OBJS = $(S)/pgsql/uuid.c + + TARGETS = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@ +@@ -231,7 +231,7 @@ install: + $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 + $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/ +- $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc + $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ + -@if [ ".$(WITH_DCE)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \ +@@ -241,7 +241,7 @@ install: + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \ + fi +- $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ ++ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \ + $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \ +@@ -276,7 +276,7 @@ uninstall: + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \ + fi +- -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3 ++ -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3 + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \ + $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \ +@@ -290,7 +290,7 @@ uninstall: + echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \ + $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \ + fi +- -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc ++ -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc + -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1 + -$(RM) $(DESTDIR)$(bindir)/uuid-config + -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) +diff -up uuid-1.6.1/pgsql/Makefile.BAD uuid-1.6.1/pgsql/Makefile +--- uuid-1.6.1/pgsql/Makefile.BAD 2008-03-06 11:53:26.000000000 -0500 ++++ uuid-1.6.1/pgsql/Makefile 2008-03-06 11:54:14.000000000 -0500 +@@ -18,13 +18,13 @@ POSTGRES := $(shell $(PG_CONFIG + top_builddir := $(dir $(PGXS))../.. + include $(top_builddir)/src/Makefile.global + +-NAME = uuid ++NAME = ossp-uuid + OBJS = uuid.o + SO_MAJOR_VERSION = 1 + SO_MINOR_VERSION = 0 + + override CPPFLAGS := -I.. $(CPPFLAGS) +-SHLIB_LINK := -L../.libs -luuid ++SHLIB_LINK := -L../.libs -lossp-uuid + SHLIB_LINK += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic") + SHLIB_LINK += $(shell test $(shell uname -s) = Darwin && echo "-bundle_loader $(POSTGRES)") + rpath := +@@ -35,16 +35,16 @@ enable_shared = yes + include $(top_builddir)/src/Makefile.shlib + + uuid.sql: uuid.sql.in +- sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' uuid.sql ++ sed -e 's;MODULE_PATHNAME;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' uuid.sql + + install: all + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(datadir) +- $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) ++ $(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) + $(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql + + uninstall: +- -rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX) ++ -rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX) + -rm -f $(DESTDIR)$(datadir)/uuid.sql + + clean distclean: clean-lib +diff -up uuid-1.6.1/uuid.pc.in.BAD uuid-1.6.1/uuid.pc.in +--- uuid-1.6.1/uuid.pc.in.BAD 2008-03-06 11:57:29.000000000 -0500 ++++ uuid-1.6.1/uuid.pc.in 2008-03-06 11:57:36.000000000 -0500 +@@ -37,6 +37,6 @@ Description: Universally Unique Identifi + Version: @UUID_VERSION_RAW@ + URL: http://www.ossp.org/pkg/lib/uuid/ + Cflags: -I${includedir} +-Libs: -L${libdir} -luuid ++Libs: -L${libdir} -lossp-uuid + Libs.private: @LIBS@ + +diff -up uuid-1.6.1/perl/Makefile.PL.BAD uuid-1.6.1/perl/Makefile.PL +--- uuid-1.6.1/perl/Makefile.PL.BAD 2008-03-06 11:12:05.000000000 -0500 ++++ uuid-1.6.1/perl/Makefile.PL 2008-03-06 11:49:25.000000000 -0500 +@@ -33,9 +33,9 @@ use Config; + use ExtUtils::MakeMaker; + + # determine source directory +-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d } +- grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la")) +- or die "no source directory found (where libuuid.la is located)"; ++my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d } ++ grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la")) ++ or die "no source directory found (where libossp-uuid.la is located)"; + + # determine extra build options + my $compat = 0; +@@ -47,7 +47,7 @@ WriteMakefile( + VERSION_FROM => 'uuid.pm', + ABSTRACT_FROM => 'uuid.pod', + PREREQ_PM => {}, +- LIBS => [ "-L$srcdir/.libs -L$srcdir -luuid" ], ++ LIBS => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ], + DEFINE => '', + INC => "-I. -I$srcdir", + PM => { 'uuid.pm' => '$(INST_LIBDIR)/uuid.pm', +diff -up uuid-1.6.1/Makefile.PL.BAD uuid-1.6.1/Makefile.PL +--- uuid-1.6.1/Makefile.PL.BAD 2008-03-06 11:09:49.000000000 -0500 ++++ uuid-1.6.1/Makefile.PL 2008-03-06 11:10:01.000000000 -0500 +@@ -44,7 +44,7 @@ ARGS = $ARGS + all pure_all: + \@if [ ! -d build ]; then mkdir build; fi + \@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi +- \@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi ++ \@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi + \@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi + \@cd perl && \$(MAKE) \$(MFLAGS) \$\@ + +diff -up uuid-1.6.1/php/config.m4.BAD uuid-1.6.1/php/config.m4 +--- uuid-1.6.1/php/config.m4.BAD 2008-03-06 11:54:55.000000000 -0500 ++++ uuid-1.6.1/php/config.m4 2008-03-06 11:55:07.000000000 -0500 +@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then + PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) + AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) + PHP_ADD_LIBPATH([..], ) +- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) ++ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) + PHP_ADD_INCLUDE([..]) + PHP_SUBST(UUID_SHARED_LIBADD) + +diff -up uuid-1.6.1/php/Makefile.local.BAD uuid-1.6.1/php/Makefile.local +--- uuid-1.6.1/php/Makefile.local.BAD 2008-03-06 11:54:39.000000000 -0500 ++++ uuid-1.6.1/php/Makefile.local 2008-03-06 11:54:49.000000000 -0500 +@@ -48,7 +48,7 @@ install: build + @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ + echo "installing PHP$$version API into $$extdir"; \ + ./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \ +- ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \ ++ ./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \ + ./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php + + clean: +diff -up uuid-1.6.1/php/uuid.ts.BAD uuid-1.6.1/php/uuid.ts +--- uuid-1.6.1/php/uuid.ts.BAD 2008-03-06 11:55:38.000000000 -0500 ++++ uuid-1.6.1/php/uuid.ts 2008-03-06 11:56:03.000000000 -0500 +@@ -34,9 +34,9 @@ + + $php_version = $argv[1]; + +-print "++ loading DSO uuid.so (low-level API)\n"; ++print "++ loading DSO ossp-uuid.so (low-level API)\n"; + if (!extension_loaded('uuid')) { +- dl('modules/uuid.so'); ++ dl('modules/ossp-uuid.so'); + } + + print "++ loading PHP uuid.php${php_version} (high-level API)\n"; diff --git a/SOURCES/uuid-1.6.2-hwaddr.patch b/SOURCES/uuid-1.6.2-hwaddr.patch new file mode 100644 index 0000000..0adc837 --- /dev/null +++ b/SOURCES/uuid-1.6.2-hwaddr.patch @@ -0,0 +1,116 @@ +diff -urN uuid-1.6.2/configure uuid-1.6.2/configure +--- uuid-1.6.2/configure 2008-07-04 15:43:09.000000000 -0600 ++++ uuid-1.6.2/configure 2012-06-06 19:19:41.659880386 -0600 +@@ -14208,7 +14208,7 @@ + + + +-for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h ++for ac_header in netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h netpacket/packet.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +diff -urN uuid-1.6.2/uuid.c uuid-1.6.2/uuid.c +--- uuid-1.6.2/uuid.c 2008-03-07 03:49:59.000000000 -0700 ++++ uuid-1.6.2/uuid.c 2012-06-06 15:50:30.060881473 -0600 +@@ -72,6 +72,8 @@ + /* IEEE 802 MAC address octet length */ + #define IEEE_MAC_OCTETS 6 + ++static unsigned char mac_unset[IEEE_MAC_OCTETS] = {BM_OCTET(1,0,0,0,0,0,0,0), 0x00, 0x00, 0x00, 0x00, 0x00}; ++ + /* UUID binary representation according to UUID standards */ + typedef struct { + uuid_uint32_t time_low; /* bits 0-31 of time field */ +@@ -967,7 +969,7 @@ + * GENERATE NODE + */ + +- if ((mode & UUID_MAKE_MC) || (uuid->mac[0] & BM_OCTET(1,0,0,0,0,0,0,0))) { ++ if ((mode & UUID_MAKE_MC) || !memcmp(uuid->mac, mac_unset, IEEE_MAC_OCTETS)) { + /* generate random IEEE 802 local multicast MAC address */ + if (prng_data(uuid->prng, (void *)&(uuid->obj.node), sizeof(uuid->obj.node)) != PRNG_RC_OK) + return UUID_RC_INT; +diff -urN uuid-1.6.2/uuid_mac.c uuid-1.6.2/uuid_mac.c +--- uuid-1.6.2/uuid_mac.c 2008-03-07 03:49:59.000000000 -0700 ++++ uuid-1.6.2/uuid_mac.c 2012-06-06 19:30:49.050879930 -0600 +@@ -76,6 +76,9 @@ + #ifdef HAVE_IFADDRS_H + #include + #endif ++#ifdef HAVE_NETPACKET_PACKET_H ++#include ++#endif + + /* own headers (part (1/2) */ + #include "uuid_mac.h" +@@ -87,6 +90,10 @@ + #define TRUE (/*lint -save -e506*/ !FALSE /*lint -restore*/) + #endif + ++#if !defined(min) ++#define min(a,b) ((a) < (b) ? (a) : (b)) ++#endif ++ + /* return the Media Access Control (MAC) address of + the FIRST network interface card (NIC) */ + int mac_address(unsigned char *data_ptr, size_t data_len) +@@ -95,28 +102,41 @@ + if (data_ptr == NULL || data_len < MAC_LEN) + return FALSE; + +-#if defined(HAVE_IFADDRS_H) && defined(HAVE_NET_IF_DL_H) && defined(HAVE_GETIFADDRS) ++#if defined(HAVE_IFADDRS_H) && (defined(HAVE_NET_IF_DL_H) || defined(HAVE_NETPACKET_PACKET_H)) && defined(HAVE_GETIFADDRS) + /* use getifaddrs(3) on BSD class platforms (xxxBSD, MacOS X, etc) */ + { + struct ifaddrs *ifap; + struct ifaddrs *ifap_head; ++#if defined(HAVE_NET_IF_DL_H) + const struct sockaddr_dl *sdl; + unsigned char *ucp; +- int i; ++#else ++ const struct sockaddr_ll *sll; ++#endif + + if (getifaddrs(&ifap_head) < 0) + return FALSE; + for (ifap = ifap_head; ifap != NULL; ifap = ifap->ifa_next) { ++#if defined(HAVE_NET_IF_DL_H) + if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_LINK) { + sdl = (const struct sockaddr_dl *)(void *)ifap->ifa_addr; + ucp = (unsigned char *)(sdl->sdl_data + sdl->sdl_nlen); + if (sdl->sdl_alen > 0) { +- for (i = 0; i < MAC_LEN && i < sdl->sdl_alen; i++, ucp++) +- data_ptr[i] = (unsigned char)(*ucp & 0xff); ++ memcpy(data_ptr, ucp, min(sdl->sdl_alen, MAC_LEN)); + freeifaddrs(ifap_head); + return TRUE; + } + } ++#else ++ if (ifap->ifa_addr != NULL && ifap->ifa_addr->sa_family == AF_PACKET) { ++ sll = (const struct sockaddr_ll *)(void *)ifap->ifa_addr; ++ if (sll->sll_hatype == ARPHRD_ETHER) { ++ memcpy(data_ptr, sll->sll_addr, min(sll->sll_halen, MAC_LEN)); ++ freeifaddrs(ifap_head); ++ return TRUE; ++ } ++ } ++#endif + } + freeifaddrs(ifap_head); + } +diff -urN uuid-1.6.2/config.h.in uuid-1.6.2/config.h.in +--- uuid-1.6.2/config.h.in 2008-07-04 15:43:10.000000000 -0600 ++++ uuid-1.6.2/config.h.in 2012-06-06 21:59:03.370227352 -0600 +@@ -75,6 +75,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_NETINET_IN_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NETPACKET_PACKET_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_NET_IF_ARP_H + diff --git a/SOURCES/uuid-1.6.2-manfix.patch b/SOURCES/uuid-1.6.2-manfix.patch new file mode 100644 index 0000000..c191e17 --- /dev/null +++ b/SOURCES/uuid-1.6.2-manfix.patch @@ -0,0 +1,13 @@ +diff -up uuid-1.6.2/uuid.1.manfix uuid-1.6.2/uuid.1 +--- uuid-1.6.2/uuid.1.manfix 2013-05-30 15:56:38.630003125 +0200 ++++ uuid-1.6.2/uuid.1 2013-05-30 16:00:57.145127756 +0200 +@@ -238,6 +238,9 @@ value representation of a \s-1UUID\s0. E + .IP "\fB\-o\fR \fIfilename\fR" 3 + .IX Item "-o filename" + Write output to \fIfilename\fR instead of to \fIstdout\fR. ++.IP "\fB\-r\fR" 3 ++.IX Item "-r" ++This is equivalent to \fB-F BIN\fR. + .IP "\fB\-d\fR" 3 + .IX Item "-d" + Decode a given \s-1UUID\s0 (given as a command line argument or if the command diff --git a/SOURCES/uuid-1.6.2-nostrip.patch b/SOURCES/uuid-1.6.2-nostrip.patch new file mode 100644 index 0000000..9234e22 --- /dev/null +++ b/SOURCES/uuid-1.6.2-nostrip.patch @@ -0,0 +1,12 @@ +diff -up uuid-1.6.2/Makefile.in.nostrip uuid-1.6.2/Makefile.in +--- uuid-1.6.2/Makefile.in.nostrip 2012-06-19 12:53:47.888028956 +0200 ++++ uuid-1.6.2/Makefile.in 2012-06-19 12:53:47.913029142 +0200 +@@ -253,7 +253,7 @@ install: + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ + fi +- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ ++ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ + -@if [ ".$(WITH_PERL)" = .yes ]; then \ + (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ diff --git a/SOURCES/uuid-1.6.2-php54.patch b/SOURCES/uuid-1.6.2-php54.patch new file mode 100644 index 0000000..206b342 --- /dev/null +++ b/SOURCES/uuid-1.6.2-php54.patch @@ -0,0 +1,226 @@ +diff -up uuid-1.6.2/php/uuid.c.php54 uuid-1.6.2/php/uuid.c +--- uuid-1.6.2/php/uuid.c.php54 2007-01-01 19:35:57.000000000 +0100 ++++ uuid-1.6.2/php/uuid.c 2012-11-06 16:05:03.354913764 +0100 +@@ -60,7 +60,7 @@ static int ctx_id; /* inte + #define ctx_name "UUID context" /* external name */ + + /* module initialization */ +-PHP_MINIT_FUNCTION(uuid) ++ZEND_MINIT_FUNCTION(uuid) + { + /* register resource identifier */ + ctx_id = zend_register_list_destructors_ex( +@@ -91,13 +91,13 @@ PHP_MINIT_FUNCTION(uuid) + } + + /* module shutdown */ +-PHP_MSHUTDOWN_FUNCTION(uuid) ++ZEND_MSHUTDOWN_FUNCTION(uuid) + { + return SUCCESS; + } + + /* module information */ +-PHP_MINFO_FUNCTION(uuid) ++ZEND_MINFO_FUNCTION(uuid) + { + char version[32]; + +@@ -115,7 +115,7 @@ PHP_MINFO_FUNCTION(uuid) + proto rc uuid_create(ctx) + $rc = uuid_create(&$uuid); + create UUID context */ +-PHP_FUNCTION(uuid_create) ++ZEND_FUNCTION(uuid_create) + { + zval *z_ctx; + ctx_t *ctx; +@@ -147,7 +147,7 @@ PHP_FUNCTION(uuid_create) + proto rc uuid_destroy(ctx) + $rc = uuid_destroy($uuid); + destroy UUID context */ +-PHP_FUNCTION(uuid_destroy) ++ZEND_FUNCTION(uuid_destroy) + { + zval *z_ctx; + ctx_t *ctx; +@@ -178,7 +178,7 @@ PHP_FUNCTION(uuid_destroy) + proto rc uuid_clone(ctx, &ctx2) + $rc = uuid_clone($uuid, &$uuid); + clone UUID context */ +-PHP_FUNCTION(uuid_clone) ++ZEND_FUNCTION(uuid_clone) + { + zval *z_ctx; + ctx_t *ctx; +@@ -217,7 +217,7 @@ PHP_FUNCTION(uuid_clone) + proto rc uuid_load(ctx, name) + $rc = uuid_name($uuid, $name); + load an existing UUID */ +-PHP_FUNCTION(uuid_load) ++ZEND_FUNCTION(uuid_load) + { + zval *z_ctx; + ctx_t *ctx; +@@ -249,7 +249,7 @@ PHP_FUNCTION(uuid_load) + proto rc uuid_make(ctx, mode[, ..., ...]) + $rc = uuid_make($uuid, $mode[, ..., ...]); + make a new UUID */ +-PHP_FUNCTION(uuid_make) ++ZEND_FUNCTION(uuid_make) + { + zval *z_ctx; + ctx_t *ctx; +@@ -307,7 +307,7 @@ PHP_FUNCTION(uuid_make) + proto rc uuid_isnil(ctx, result) + $rc = uuid_isnil($uuid, &$result); + compare UUID for being Nil UUID */ +-PHP_FUNCTION(uuid_isnil) ++ZEND_FUNCTION(uuid_isnil) + { + zval *z_ctx; + ctx_t *ctx; +@@ -344,7 +344,7 @@ PHP_FUNCTION(uuid_isnil) + proto rc uuid_compare(ctx, ctx2, result) + $rc = uuid_compare($uuid, $uuid2, &$result); + compare two UUIDs */ +-PHP_FUNCTION(uuid_compare) ++ZEND_FUNCTION(uuid_compare) + { + zval *z_ctx; + ctx_t *ctx; +@@ -388,7 +388,7 @@ PHP_FUNCTION(uuid_compare) + proto rc uuid_import(ctx, fmt, data) + $rc = uuid_import($ctx, $fmt, $data); + import UUID from variable */ +-PHP_FUNCTION(uuid_import) ++ZEND_FUNCTION(uuid_import) + { + zval *z_ctx; + ctx_t *ctx; +@@ -424,7 +424,7 @@ PHP_FUNCTION(uuid_import) + proto rc uuid_export(ctx, fmt, data) + $rc = uuid_error($ctx, $fmt, &$data); + export UUID into variable */ +-PHP_FUNCTION(uuid_export) ++ZEND_FUNCTION(uuid_export) + { + zval *z_ctx; + ctx_t *ctx; +@@ -472,7 +472,7 @@ PHP_FUNCTION(uuid_export) + proto rc uuid_error(ctx) + $error = uuid_error($rc); + return error string corresponding to error return code */ +-PHP_FUNCTION(uuid_error) ++ZEND_FUNCTION(uuid_error) + { + int z_rc; + uuid_rc_t rc; +@@ -490,24 +490,79 @@ PHP_FUNCTION(uuid_error) + proto int uuid_version() + $version = uuid_version(); + return library version number */ +-PHP_FUNCTION(uuid_version) ++ZEND_FUNCTION(uuid_version) + { + RETURN_LONG((long)uuid_version()); + } + ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_create, 0) ++ ZEND_ARG_INFO(1, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_destroy, 0) ++ ZEND_ARG_INFO(0, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_clone, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(1, ctx2) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_load, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, name) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_uuid_make, 0, 0, 2) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, mode) ++ ZEND_ARG_INFO(0, ctxns) ++ ZEND_ARG_INFO(0, url) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_isnil, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_compare, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, ctx2) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_import, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, fmt) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_export, 0) ++ ZEND_ARG_INFO(0, ctx) ++ ZEND_ARG_INFO(0, fmt) ++ ZEND_ARG_INFO(1, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_error, 0) ++ ZEND_ARG_INFO(0, ctx) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_uuid_version, 0) ++ZEND_END_ARG_INFO() ++ + /* module function table */ +-static function_entry uuid_functions[] = { +- PHP_FE(uuid_create, NULL) +- PHP_FE(uuid_destroy, NULL) +- PHP_FE(uuid_clone, NULL) +- PHP_FE(uuid_load, NULL) +- PHP_FE(uuid_make, NULL) +- PHP_FE(uuid_isnil, NULL) +- PHP_FE(uuid_compare, NULL) +- PHP_FE(uuid_import, NULL) +- PHP_FE(uuid_export, NULL) +- PHP_FE(uuid_error, NULL) +- PHP_FE(uuid_version, NULL) ++static zend_function_entry uuid_functions[] = { ++ ZEND_FE(uuid_create, arginfo_uuid_create) ++ ZEND_FE(uuid_destroy, NULL) ++ ZEND_FE(uuid_clone, arginfo_uuid_clone) ++ ZEND_FE(uuid_load, NULL) ++ ZEND_FE(uuid_make, NULL) ++ ZEND_FE(uuid_isnil, arginfo_uuid_isnil) ++ ZEND_FE(uuid_compare, arginfo_uuid_compare) ++ ZEND_FE(uuid_import, NULL) ++ ZEND_FE(uuid_export, arginfo_uuid_export) ++ ZEND_FE(uuid_error, NULL) ++ ZEND_FE(uuid_version, NULL) + { NULL, NULL, NULL } + }; + +@@ -516,11 +571,11 @@ zend_module_entry uuid_module_entry = { + STANDARD_MODULE_HEADER, + "uuid", + uuid_functions, +- PHP_MINIT(uuid), +- PHP_MSHUTDOWN(uuid), ++ ZEND_MINIT(uuid), ++ ZEND_MSHUTDOWN(uuid), + NULL, + NULL, +- PHP_MINFO(uuid), ++ ZEND_MINFO(uuid), + NO_VERSION_YET, + STANDARD_MODULE_PROPERTIES + }; diff --git a/SOURCES/uuid-aarch64.patch b/SOURCES/uuid-aarch64.patch new file mode 100644 index 0000000..bf6f1f5 --- /dev/null +++ b/SOURCES/uuid-aarch64.patch @@ -0,0 +1,1588 @@ +diff -urN uuid-1.6.2/config.guess uuid-1.6.2-aarch64/config.guess +--- uuid-1.6.2/config.guess 2008-07-04 16:43:08.000000000 -0500 ++++ uuid-1.6.2-aarch64/config.guess 2013-03-03 09:02:58.671329550 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2008-01-08' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -170,7 +169,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -324,14 +330,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -375,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -461,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -475,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -532,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -575,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -640,7 +665,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -711,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -750,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -769,34 +794,39 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -806,6 +836,9 @@ + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -835,6 +868,27 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -842,20 +896,40 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -866,74 +940,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +@@ -943,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -958,78 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1037,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1058,7 +1034,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1073,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1101,10 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1139,8 +1118,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1153,7 +1142,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1173,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1202,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1216,6 +1205,12 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1243,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1258,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1303,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1324,11 +1332,14 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +@@ -1484,9 +1495,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -urN uuid-1.6.2/config.sub uuid-1.6.2-aarch64/config.sub +--- uuid-1.6.2/config.sub 2008-07-04 16:43:08.000000000 -0500 ++++ uuid-1.6.2-aarch64/config.sub 2013-03-03 09:02:58.680328512 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2008-01-16' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -120,12 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -148,10 +156,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -166,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -214,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -238,24 +255,32 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -268,29 +293,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -300,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -314,29 +367,37 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -351,27 +412,32 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) +@@ -393,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -439,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -455,10 +525,27 @@ + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -487,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -526,6 +613,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -641,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -699,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -735,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -803,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -885,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -981,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1037,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1120,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1128,6 +1234,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1166,7 +1276,7 @@ + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1213,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1236,21 +1349,23 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1258,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1297,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1346,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1388,6 +1503,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1410,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1425,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1446,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1480,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) +@@ -1585,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) diff --git a/SPECS/uuid.spec b/SPECS/uuid.spec new file mode 100644 index 0000000..bff4fa7 --- /dev/null +++ b/SPECS/uuid.spec @@ -0,0 +1,453 @@ +%if 0%{?fedora} < 20 && 0%{?rhel} < 7 +# Private libraries are not be exposed globally by RPM +%{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$} +%{?filter_setup} +%endif + +Name: uuid +Version: 1.6.2 +Release: 53%{?dist} +Summary: Universally Unique Identifier library +License: MIT +URL: http://www.ossp.org/pkg/lib/uuid/ +Source0: ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz +Patch0: uuid-1.6.1-ossp.patch +Patch1: uuid-1.6.1-mkdir.patch +Patch2: uuid-1.6.2-php54.patch + +# rhbz#829532 +Patch3: uuid-1.6.2-hwaddr.patch + +# do not strip binaries +Patch4: uuid-1.6.2-nostrip.patch +Patch5: uuid-1.6.2-manfix.patch +Patch6: uuid-aarch64.patch + +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: libtool + +Obsoletes: %{name}-pgsql < 1.6.2-24 + +%description +OSSP uuid is a ISO-C:1999 application programming interface (API) +and corresponding command line interface (CLI) for the generation +of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant Universally +Unique Identifier (UUID). It supports DCE 1.1 variant UUIDs of version +1 (time and node based), version 3 (name based, MD5), version 4 +(random number based) and version 5 (name based, SHA-1). Additional +API bindings are provided for the languages ISO-C++:1998 and Perl:5 +Optional backward compatibility exists for the ISO-C DCE-1.1 and Perl +Data::UUID APIs. + +%package devel +Summary: Development support for Universally Unique Identifier library +Requires: pkgconfig +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers and libraries for OSSP uuid. + +%package c++ +Summary: C++ support for Universally Unique Identifier library +Requires: %{name} = %{version}-%{release} + +%description c++ +C++ libraries for OSSP uuid. + +%package c++-devel +Summary: C++ development support for Universally Unique Identifier library +Requires: %{name}-c++ = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description c++-devel +C++ development headers and libraries for OSSP uuid. + +%package perl +Summary: Perl support for Universally Unique Identifier library +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: perl-interpreter +BuildRequires: perl(Carp) +BuildRequires: perl(Config) +BuildRequires: perl(Data::UUID) +BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(IO::File) +BuildRequires: perl(MIME::Base64) +BuildRequires: perl(strict) +BuildRequires: perl(Test::More) +BuildRequires: perl(Tie::Scalar) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: %{name} = %{version}-%{release} +Requires: perl(Data::UUID) + +%description perl +Perl OSSP uuid module. + +%package dce +Summary: DCE support for Universally Unique Identifier library +Requires: %{name} = %{version}-%{release} + +%description dce +DCE OSSP uuid library. + +%package dce-devel +Summary: DCE development support for Universally Unique Identifier library +Requires: %{name}-dce = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description dce-devel +DCE development headers and libraries for OSSP uuid. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 -b .php54 +%patch3 -p1 -b .hwaddr +%patch4 -p1 -b .nostrip +%patch5 -p1 -b .manfix +%patch6 -p1 -b .aarch64 + +%build +# Build the library. +export LIB_NAME=libossp-uuid.la +export DCE_NAME=libossp-uuid_dce.la +export CXX_NAME=libossp-uuid++.la +export PHP_NAME=$(pwd)/php/modules/ossp-uuid.so +export PGSQL_NAME=$(pwd)/pgsql/libossp-uuid.so +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" +%configure \ + --disable-static \ + --without-perl \ + --without-php \ + --with-dce \ + --with-cxx \ + --without-pgsql + +make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" %{?_smp_mflags} + +# Build the Perl module. +pushd perl +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" COMPAT=0 +%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile +make %{?_smp_mflags} +popd + +%install +rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/*.a +chmod 755 $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.* + +# Install the Perl modules. +pushd perl +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT + +find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; + +%{_fixperms} $RPM_BUILD_ROOT/* +popd + +%check +make check + +pushd perl +LD_LIBRARY_PATH=../.libs make test +# Check that current Data::UUID is compatible with old compat layer +perl -MData::UUID -e 'print "Testing compatibility of Data::UUID version $Data::UUID::VERSION\n";' +LD_LIBRARY_PATH=../.libs make test TEST_FILES=uuid_compat.ts +popd + +%ldconfig_scriptlets +%ldconfig_scriptlets c++ +%ldconfig_scriptlets dce + +%files +%doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS +%{_bindir}/uuid +%{_libdir}/libossp-uuid.so.* +%{_mandir}/man1/* +%exclude %{_mandir}/man1/uuid-config.* + +%files devel +%{_bindir}/uuid-config +%{_includedir}/uuid.h +%{_libdir}/libossp-uuid.so +%{_libdir}/pkgconfig/ossp-uuid.pc +%{_mandir}/man3/ossp-uuid.3* +%{_mandir}/man1/uuid-config.* + +%files c++ +%{_libdir}/libossp-uuid++.so.* + +%files c++-devel +%{_includedir}/uuid++.hh +%{_libdir}/libossp-uuid++.so +%{_mandir}/man3/uuid++.3* + +%files perl +%{perl_vendorarch}/auto/* +%{perl_vendorarch}/OSSP* +%{_mandir}/man3/OSSP::uuid.3* + +%files dce +%{_libdir}/libossp-uuid_dce.so.* + +%files dce-devel +%{_includedir}/uuid_dce.h +%{_libdir}/libossp-uuid_dce.so + +%changelog +* Tue Aug 10 2021 Mohan Boddu - 1.6.2-53 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Aug 6 2021 Florian Weimer - 1.6.2-52 +- Rebuild to pick up new build flags from redhat-rpm-config (#1984652) + +* Fri Apr 16 2021 Mohan Boddu - 1.6.2-51 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.6.2-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.2-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 1.6.2-48 +- Perl 5.32 rebuild + +* Mon Mar 16 2020 Jitka Plesnikova - 1.6.2-47 +- Specify all perl dependencies + +* Fri Jan 31 2020 Fedora Release Engineering - 1.6.2-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.6.2-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 31 2019 Jitka Plesnikova - 1.6.2-44 +- Perl 5.30 rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.6.2-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Jitka Plesnikova - 1.6.2-41 +- Perl 5.28 rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.2-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 07 2017 Igor Gnatenko - 1.6.2-37 +- Rebuild due to bug in RPM (RHBZ #1468476) + +* Mon Jun 05 2017 Jitka Plesnikova - 1.6.2-36 +- Perl 5.26 rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Sep 1 2016 Matias Kreder - 1.6.2-34 +- Removed uuid-php subpackage since php(api) is no longer provided on +- PHP 7 and there is a replacement (pecl/uuid extension) + +* Sun May 15 2016 Jitka Plesnikova - 1.6.2-33 +- Perl 5.24 rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.6.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 05 2015 Jitka Plesnikova - 1.6.2-30 +- Perl 5.22 rebuild + +* Sat May 02 2015 Kalev Lember - 1.6.2-29 +- Rebuilt for GCC 5 C++11 ABI change + +* Thu Aug 28 2014 Jitka Plesnikova - 1.6.2-28 +- Perl 5.20 rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.6.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jun 19 2014 Remi Collet - 1.6.2-26 +- rebuild for https://fedoraproject.org/wiki/Changes/Php56 +- add numerical prefix to PHP extension configuration file + +* Sun Jun 08 2014 Fedora Release Engineering - 1.6.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Oct 30 2013 Michal Hlavinka - 1.6.2-24 +- drop uuid-pgsql subpackage, it is outdated and does not work, use + uuid-ossp module from postgresql-contrib instead + +* Mon Sep 16 2013 Paul Howarth - 1.6.2-23 +- drop the perl(Data::UUID) compatibility shim and require the real thing + instead (#998591) + +* Thu Sep 12 2013 Michal Hlavinka - 1.6.2-22 +- rebuild for postgresql api change + +* Wed Aug 14 2013 Michal Hlavinka - 1.6.2-21 +- fix aarch64 support (#926687) + +* Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 1.6.2-19 +- Perl 5.18 rebuild + +* Thu May 30 2013 Michal Hlavinka - 1.6.2-18 +- describe -r in man page + +* Fri Mar 22 2013 Remi Collet - 1.6.2-17 +- rebuild for http://fedoraproject.org/wiki/Features/Php55 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.6.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 06 2012 Michal Hlavinka - 1.6.2-15 +- make uuid-php compatible with php 5.4 (#873594) + +* Sun Jul 22 2012 Fedora Release Engineering - 1.6.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Petr Pisar - 1.6.2-13 +- Perl 5.16 rebuild + +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-12 +- enforce usage of our c(xx)flags + +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-11 +- fix debuginfo + +* Tue Jun 19 2012 Michal Hlavinka - 1.6.2-10 +- fix generation of MAC address based uuids (#829532), + patch by Philip Prindeville + +* Fri Jun 08 2012 Petr Pisar - 1.6.2-9 +- Perl 5.16 rebuild + +* Thu Jan 19 2012 Remi Collet - 1.6.2-8 +- build against php 5.4, with patch +- add filter_provides to avoid private-shared-object-provides shout.so +- add minimal %%check for php extension + +* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jun 17 2011 Marcela Mašláňová - 1.6.2-6 +- Perl mass rebuild + +* Sat May 14 2011 Iain Arnell 1.6.2-5 +- fix php_zend_api check + +* Thu Mar 03 2011 Karsten Hopp 1.6.2-4 +- fix build + +* Mon Feb 07 2011 Fedora Release Engineering - 1.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 02 2010 Marcela Maslanova - 1.6.2-2 +- Mass rebuild with perl-5.12.0 + +* Wed Apr 21 2010 Michal Hlavinka - 1.6.2-1 +- updated to 1.6.2 +- uuid-config man page moved to sub-package containing uuid-config (#562838) + +* Mon Feb 1 2010 Stepan Kasal - 1.6.1-10 +- silence rpmlint by using $(pwd) instead of shell variable RPM_SOURCE_DIR + +* Mon Dec 7 2009 Stepan Kasal - 1.6.1-9 +- rebuild against perl 5.10.1 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jul 13 2009 Remi Collet - 1.6.1-7 +- rebuild for new PHP 5.3.0 ABI (20090626) +- add PHP ABI check +- use php_extdir +- add php configuration file (/etc/php.d/uuid.ini) + +* Thu May 7 2009 Michael Schwendt - 1.6.1-6 +- Using plain old "Requires: pkgconfig" instead -- see my post to + fedora-devel-list made today. + +* Mon May 4 2009 Michael Schwendt - 1.6.1-5 +- Replace expensive %%{_libdir}/pkgconfig dependency in uuid-devel + with pkgconfig%%{_isa} for Fedora >= 11 (#484849). + +* Wed Feb 25 2009 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Mar 06 2008 Tom "spot" Callaway - 1.6.1-3 +- Rebuild for new perl + +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-2 +- forgot to cvs add patch + +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.1-1 +- 1.6.1 + +* Thu Mar 6 2008 Tom "spot" Callaway - 1.6.0-4 +- rebuild for new perl + +* Tue Feb 19 2008 Fedora Release Engineering - 1.6.0-3 +- Autorebuild for GCC 4.3 + +* Wed Aug 29 2007 Fedora Release Engineering - 1.6.0-2 +- Rebuild for selinux ppc32 issue. + +* Tue Jul 24 2007 Steven Pritchard 1.6.0-1 +- Update to 1.6.0. +- BR Test::More. + +* Tue Apr 17 2007 Steven Pritchard 1.5.1-3 +- Fix find option order. +- Use fixperms macro instead of our own chmod incantation. +- BR ExtUtils::MakeMaker. + +* Thu Oct 05 2006 Christian Iseli 1.5.1-2 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Mon Aug 28 2006 Steven Pritchard 1.5.1-1 +- Update to 1.5.1. + +* Sat Jul 29 2006 Steven Pritchard 1.5.0-1 +- Update to 1.5.0. +- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc + to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520). +- Clean out the pgsql directory. (Some cruft shipped with this release.) + +* Wed May 24 2006 Steven Pritchard 1.4.2-4 +- Remove static php module. + +* Tue May 23 2006 Steven Pritchard 1.4.2-3 +- Force use of system libtool. +- Make libs executable. + +* Tue May 23 2006 Steven Pritchard 1.4.2-2 +- License is MIT(-ish). + +* Fri May 19 2006 Steven Pritchard 1.4.2-1 +- Initial packaging attempt.