7166560 nmap fails to build on 15
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 23 May 2012 11:03:10 -0700
changeset 826 c6aad84d2493
parent 825 78809aba88fe
child 827 0944d8c0158b
7166560 nmap fails to build on 15 7166289 clisp build segv's on 15
components/clisp/Makefile
components/nmap/patches/libdnet-stripped.src.vmtypes.patch
--- a/components/clisp/Makefile	Wed May 23 01:05:52 2012 -0700
+++ b/components/clisp/Makefile	Wed May 23 11:03:10 2012 -0700
@@ -51,7 +51,7 @@
 
 # clisp's configure script is not a GNU auto* tools generated configure script
 # and doesn't take --sbindir, so we need to override the default values.
-CONFIGURE_OPTIONS = CC="$(CC)"
+CONFIGURE_OPTIONS = CC="$(CC) -DNO_GENERATIONAL_GC"
 CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX)
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/nmap/patches/libdnet-stripped.src.vmtypes.patch	Wed May 23 11:03:10 2012 -0700
@@ -0,0 +1,72 @@
+--- nmap-5.51/libdnet-stripped/include/dnet/fw.h.orig	Fri May  4 09:39:17 2012
++++ nmap-5.51/libdnet-stripped/include/dnet/fw.h	Fri May  4 09:39:30 2012
[email protected]@ -39,16 +39,16 @@
+ 	(rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2;		\
+ } while (0)
+ 
+-typedef struct fw_handle fw_t;
++typedef struct fw_handle dnet_fw_t;
+ 
+ typedef int (*fw_handler)(const struct fw_rule *rule, void *arg);
+ 
+ __BEGIN_DECLS
+-fw_t	*fw_open(void);
+-int	 fw_add(fw_t *f, const struct fw_rule *rule);
+-int	 fw_delete(fw_t *f, const struct fw_rule *rule);
+-int	 fw_loop(fw_t *f, fw_handler callback, void *arg);
+-fw_t	*fw_close(fw_t *f);
++dnet_fw_t	*fw_open(void);
++int	 fw_add(dnet_fw_t *f, const struct fw_rule *rule);
++int	 fw_delete(dnet_fw_t *f, const struct fw_rule *rule);
++int	 fw_loop(dnet_fw_t *f, fw_handler callback, void *arg);
++dnet_fw_t	*fw_close(dnet_fw_t *f);
+ __END_DECLS
+ 
+ #endif /* DNET_FW_H */
+--- nmap-5.51/libdnet-stripped/src/fw-none.c.orig	Fri May  4 09:43:16 2012
++++ nmap-5.51/libdnet-stripped/src/fw-none.c	Fri May  4 09:43:28 2012
[email protected]@ -14,7 +14,7 @@
+ 
+ #include "dnet.h"
+ 
+-fw_t *
++dnet_fw_t *
+ fw_open(void)
+ {
+ 	errno = ENOSYS;
[email protected]@ -22,7 +22,7 @@
+ }
+ 
+ int
+-fw_add(fw_t *f, const struct fw_rule *rule)
++fw_add(dnet_fw_t *f, const struct fw_rule *rule)
+ {
+ 	errno = ENOSYS;
+ 	return (-1);
[email protected]@ -29,7 +29,7 @@
+ }
+ 
+ int
+-fw_delete(fw_t *f, const struct fw_rule *rule)
++fw_delete(dnet_fw_t *f, const struct fw_rule *rule)
+ {
+ 	errno = ENOSYS;
+ 	return (-1);
[email protected]@ -36,14 +36,14 @@
+ }
+ 
+ int
+-fw_loop(fw_t *f, fw_handler callback, void *arg)
++fw_loop(dnet_fw_t *f, fw_handler callback, void *arg)
+ {
+ 	errno = ENOSYS;
+ 	return (-1);
+ }
+ 
+-fw_t *
+-fw_close(fw_t *f)
++dnet_fw_t *
++fw_close(dnet_fw_t *f)
+ {
+ 	return (NULL);
+ }