mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-22 20:41:26 +00:00
Fix libgmp breakage on -current.
This commit is contained in:
parent
6e26545bd1
commit
d7b8935d2c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=58144
@ -66,6 +66,12 @@ CONFIGURE_ARGS+= --without-idea
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} > 500023
|
||||
LIB_DEPENDS+= gmp.4:${PORTSDIR}/math/libgmp3
|
||||
MAKE_ENV+= GMPINCDIR="${LOCALBASE}/include" \
|
||||
GMPLIBDIR="${LOCALBASE}/lib"
|
||||
.endif
|
||||
|
||||
.if (${OSVERSION} >= 400016 && !defined(REALLY_WANT_SSH))
|
||||
FORBIDDEN= "OpenSSH is a superior version of SSH which has been included in the FreeBSD base system since 4.0-RELEASE. This port is now deprecated and will be removed at some point in the future. To override this warning set the REALLY_WANT_SSH environment variable and rebuild."
|
||||
.endif
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig Wed May 12 04:19:31 1999
|
||||
+++ Makefile.in Sun Sep 17 01:39:40 2000
|
||||
--- Makefile.in.orig Wed May 12 14:19:31 1999
|
||||
+++ Makefile.in Fri Apr 26 09:19:30 2002
|
||||
@@ -301,12 +301,17 @@
|
||||
SHELL = /bin/sh
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
-GMPLIBS = -L$(GMPDIR) -lgmp
|
||||
-GMPDEP = $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
|
||||
+# We have the same libgmp in the system, so use it instead
|
||||
+GMPINCDIR = /usr/include
|
||||
+GMPLIBDIR = /usr/lib
|
||||
+GMPLIBS = -lgmp
|
||||
+GMPINCDIR ?= /usr/include
|
||||
+GMPLIBDIR ?= /usr/lib
|
||||
+GMPLIBS = -L$(GMPLIBDIR) -lgmp
|
||||
+GMPDEP = $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
|
||||
|
||||
ZLIBDIR = zlib-1.0.4
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
.c.o:
|
||||
- $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
|
||||
+ $(CC) -c -I. $(KERBEROS_INCS) -I$(srcdir)/$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
|
||||
+ $(CC) -c -I. $(KERBEROS_INCS) -I$(GMPINCDIR) -I$(srcdir)/$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" -DTIS_MAP_FILE=\"$(TIS_MAP_FILE)\" $(CFLAGS) $(X_CFLAGS) $<
|
||||
|
||||
sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
|
||||
-rm -f sshd
|
||||
|
Loading…
Reference in New Issue
Block a user