gcc47: Add libssp and libssp_noshared

These libraries were not part of the gcc 4.4 system compiler set.
Some pkgsrc packages assume the ssp libraries come with the compiler,
so add them to the gcc 4.7 library set.

diff --git a/contrib/gcc-4.7/README.DELETED b/contrib/gcc-4.7/README.DELETED
index 21f3e96..0009c70 100644 (file)
--- a/contrib/gcc-4.7/README.DELETED
+++ b/contrib/gcc-4.7/README.DELETED
@@ -617,7 +617,13 @@ libobjc/aclocal.m4
 libobjc/configure
 libobjc/configure.ac
 libquadmath/
-libssp/
+libssp/ChangeLog
+libssp/Makefile.am
+libssp/Makefile.in
+libssp/aclocal.m4
+libssp/configure
+libssp/configure.ac
+libssp/libtool-version
 libstdc++-v3/ChangeLog
 libstdc++-v3/ChangeLog-1998
 libstdc++-v3/ChangeLog-1999

diff --git a/gnu/lib/gcc47/Makefile b/gnu/lib/gcc47/Makefile
index 924849b..e575e9e 100644 (file)
--- a/gnu/lib/gcc47/Makefile
+++ b/gnu/lib/gcc47/Makefile
@@ -3,6 +3,8 @@ SUBDIR+=        libgcc
 SUBDIR+=       libgcc_eh
 SUBDIR+=       libgcc_pic
 SUBDIR+=       libgcov
+SUBDIR+=       libssp
+SUBDIR+=       libssp_nonshared
 
 .if !defined(NO_CXX)
 SUBDIR+=       libstdc++

diff --git a/gnu/lib/gcc47/libssp/Makefile b/gnu/lib/gcc47/libssp/Makefile
new file mode 100644 (file)
index 0000000..89692ea
--- /dev/null
+++ b/gnu/lib/gcc47/libssp/Makefile
@@ -0,0 +1,34 @@
+CFLAGS+=       -I${.CURDIR}
+CFLAGS+=       -I${.OBJDIR}
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}/libssp
+
+CFLAGS+=       -DHAVE_CONFIG_H
+LDFLAGS+=      -Wl,--version-script=${GCCDIR}/libssp/ssp.map
+
+LIB=           ssp
+SHLIB_MAJOR=   0
+
+# From libssp Makefile
+libssp_la_SOURCES = \
+       ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \
+       memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \
+       strcat-chk.c strcpy-chk.c strncat-chk.c strncpy-chk.c \
+       vsnprintf-chk.c vsprintf-chk.c
+
+SRCS=  ${libssp_la_SOURCES}
+
+# generated
+SRCS+= ssp.h
+
+sspdir:
+       mkdir -p ssp
+
+ssp.h: sspdir ${GCCDIR}/libssp/ssp/ssp.h.in
+       sed -e 's/@ssp_have_usable_vsnprintf@/define/' \
+           < ${.ALLSRC:Nsspdir} > ssp/${.TARGET}
+
+CLEANDIRS+=    ssp
+
+.include <bsd.lib.mk>

diff --git a/gnu/lib/gcc47/libssp/config.h b/gnu/lib/gcc47/libssp/config.h
new file mode 100644 (file)
index 0000000..65396f9
--- /dev/null
+++ b/gnu/lib/gcc47/libssp/config.h
@@ -0,0 +1,102 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <alloca.h> header file. */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* __attribute__((visibility ("hidden"))) supported */
+#define HAVE_HIDDEN_VISIBILITY 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mempcpy' function. */
+#define HAVE_MEMPCPY 1
+
+/* Define to 1 if you have the <paths.h> header file. */
+#define HAVE_PATHS_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strncat' function. */
+#define HAVE_STRNCAT 1
+
+/* Define to 1 if you have the `strncpy' function. */
+#define HAVE_STRNCPY 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* vsnprintf is present and works */
+#define HAVE_USABLE_VSNPRINTF 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libssp"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libssp"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libssp 1.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libssp"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.0"

diff --git a/gnu/lib/gcc47/libssp_nonshared/Makefile b/gnu/lib/gcc47/libssp_nonshared/Makefile
new file mode 100644 (file)
index 0000000..7db59b0
--- /dev/null
+++ b/gnu/lib/gcc47/libssp_nonshared/Makefile
@@ -0,0 +1,12 @@
+CFLAGS+=       -I${.CURDIR}/libssp
+.include "../Makefile.inc"
+.PATH: ${GCCDIR}/libssp
+
+LIB=           ssp_nonshared
+
+SRCS+=         ssp-local.c
+
+CFLAGS+=       -fPIC
+CFLAGS+=       -DPIC
+
+.include <bsd.lib.mk>