Module Name: src
Committed By: tsutsui
Date: Sat Jan 27 10:57:05 UTC 2024
Modified Files:
src/external/mit/xorg/server/xorg-server.old: Makefile.servermod
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb:
Makefile
Log Message:
Revert previous (stop building static libfb.a module for Xorg 1.10).
It breaks builds in xorg-server.old/hw/xfree86/Xorg on alpha,
netwinder, and sgimips (but not vax).
>> dependall ===> external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg
>> nbmake[13]: don't know how to make
>> [...]/xorg-server.old/hw/xfree86/dixmods/fb/libfb.a. Stop
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server.old/Makefile.servermod
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/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.old/Makefile.servermod
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.6 src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.7
--- src/external/mit/xorg/server/xorg-server.old/Makefile.servermod:1.6 Fri Jan 26 11:32:12 2024
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.servermod Sat Jan 27 10:57:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.servermod,v 1.6 2024/01/26 11:32:12 tsutsui Exp $
+# $NetBSD: Makefile.servermod,v 1.7 2024/01/27 10:57:04 tsutsui Exp $
NOFULLRELRO= yes
@@ -7,7 +7,7 @@ NOFULLRELRO= yes
.if defined(XMODULEDIR)
SHLIB_MAJOR=0
-# dri and dri2 need to be linked statically as well?
+# dri, dri2 and fb need to be linked statically as well?
.if !defined(XMODULEDIRANDSTATIC)
MKSTATICLIB:= no
.endif
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile:1.2 Fri Jan 26 11:32:12 2024
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/dixmods/fb/Makefile Sat Jan 27 10:57:05 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2024/01/26 11:32:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2024/01/27 10:57:05 tsutsui Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
+XMODULEDIRANDSTATIC= # defined
.include "../../../../Makefile.serverlib"
.include "../../../../Makefile.servermod"
