Module Name: src
Committed By: christos
Date: Wed Jun 29 19:36:56 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
Log Message:
Fix MKCRYPTO=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile:1.11 Tue Aug 2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/29 19:36:56 christos Exp $
.include <bsd.own.mk>
@@ -81,8 +81,7 @@ LDADD+= ${LDADD.dix} \
-lpixman-1 \
-lXdmcp \
-lz \
- -lm \
- -lcrypto
+ -lm
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+= ${DPADD.dix} \
${LIBPIXMAN1} \
${LIBXDMCP} \
${LIBZ} \
- ${LIBM} \
- ${LIBCRYPTO}
+ ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile:1.7 Thu Jul 23 04:03:25 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/29 19:36:56 christos Exp $
.include <bsd.own.mk>
@@ -62,7 +62,6 @@ LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
LDADD+= -lpciaccess -ldrm
-LDADD+= -lcrypto
LDADD+= -Wl,--no-whole-archive
.if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+= ${DPADD.dix} \
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
- ${LIBCRYPTO}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.14 Tue Aug 2 05:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Wed Jun 29 15:36:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/08/02 09:11:38 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/29 19:36:56 christos Exp $
.include <bsd.own.mk>
@@ -71,7 +71,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.glx} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
- -lXdmcp -lfreetype -lm -lcrypto
+ -lXdmcp -lfreetype -lm
DPADD+= ${LDADD.dix} \
${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+= ${LDADD.dix} \
${DPADD.glx} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
- ${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+ ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
