sync code with last improvements from OpenBSD
This commit is contained in:
commit
88965415ff
GPG key ID:
F42C07F07E2E35B7
26235 changed files with 29195616 additions and 0 deletions
13
share/mk/Makefile
Normal file
13
share/mk/Makefile
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# $OpenBSD: Makefile,v 1.7 2016/10/11 22:36:53 matthieu Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
FILES= bsd.xconf.mk bsd.xorg.mk package_version.m4
|
||||
|
||||
all:
|
||||
|
||||
install::
|
||||
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
|
||||
${DESTDIR}${X11BASE}/share/mk
|
||||
|
||||
.include <bsd.xorg.mk>
|
||||
19
share/mk/bsd.xconf.mk
Normal file
19
share/mk/bsd.xconf.mk
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# $OpenBSD: bsd.xconf.mk,v 1.36 2020/08/26 06:25:26 jsg Exp $
|
||||
|
||||
# Build GL libs and apps?
|
||||
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa" || \
|
||||
${MACHINE_ARCH} == "m88k" || ${MACHINE_ARCH} == "sh"
|
||||
XENOCARA_BUILD_GL?=no
|
||||
XENOCARA_BUILD_DRI?=no
|
||||
.else
|
||||
XENOCARA_BUILD_GL?=yes
|
||||
XENOCARA_BUILD_DRI?=yes
|
||||
.endif
|
||||
|
||||
# Build DRI3 support?
|
||||
.if ${XENOCARA_BUILD_DRI:L} == "no" || ${MACHINE_ARCH} == "hppa" || \
|
||||
${MACHINE_ARCH} == "sh"
|
||||
XENOCARA_BUILD_DRI3?=no
|
||||
.else
|
||||
XENOCARA_BUILD_DRI3?=yes
|
||||
.endif
|
||||
285
share/mk/bsd.xorg.mk
Normal file
285
share/mk/bsd.xorg.mk
Normal file
|
|
@ -0,0 +1,285 @@
|
|||
# $OpenBSD: bsd.xorg.mk,v 1.65 2023/05/07 06:55:21 matthieu Exp $ -*- makefile -*-
|
||||
#
|
||||
# Copyright © 2006,2012 Matthieu Herrb
|
||||
#
|
||||
# Permission to use, copy, modify, and distribute this software for any
|
||||
# purpose with or without fee is hereby granted, provided that the above
|
||||
# copyright notice and this permission notice appear in all copies.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
|
||||
.if exists(${.CURDIR}/../Makefile.inc)
|
||||
.include "${.CURDIR}/../Makefile.inc"
|
||||
.endif
|
||||
|
||||
AUTOMAKE_VERSION= 1.12
|
||||
AUTOCONF_VERSION= 2.71
|
||||
PYTHON_VERSION= 3.10
|
||||
|
||||
# Where source lives
|
||||
XSRCDIR?= /usr/xenocara
|
||||
|
||||
# Where to build
|
||||
XOBJDIR?= /usr/xobj
|
||||
|
||||
# Where to install
|
||||
BINDIR?= ${X11BASE}/bin
|
||||
LIBDIR= ${X11BASE}/lib
|
||||
INCSDIR= ${X11BASE}/include
|
||||
MANDIR= ${X11BASE}/man/man
|
||||
|
||||
PKG_CONFIG_LIBDIR= /usr/lib/pkgconfig:${X11BASE}/lib/pkgconfig
|
||||
|
||||
# A few aliases for *-install targets
|
||||
INSTALL_DATA = \
|
||||
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE}
|
||||
|
||||
# Autoconf cache
|
||||
_cache= --cache-file=${XOBJDIR}/xorg-config.cache.${MACHINE}
|
||||
|
||||
CFLAGS+= $(COPTS)
|
||||
|
||||
.if !defined(CONFIG_SITE)
|
||||
CONFIG_SITE= ${XSRCDIR}/etc/config.site
|
||||
.endif
|
||||
|
||||
_SRCDIR?= ${.CURDIR}
|
||||
|
||||
XENOCARA_PATH?= /bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
|
||||
|
||||
CONFIGURE_ENV= PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)" \
|
||||
CONFIG_SITE=$(CONFIG_SITE) \
|
||||
CC="$(CC)" \
|
||||
CFLAGS="$(CFLAGS:C/ *$//)" \
|
||||
CXX="$(CXX)" \
|
||||
CXXFLAGS="$(CXXFLAGS:C/ *$//)" \
|
||||
AR_FLAGS="cruD" \
|
||||
MAKE="${MAKE}"
|
||||
|
||||
CONFIGURE_ARGS+= --disable-silent-rules
|
||||
|
||||
AUTOTOOLS_ENV= AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
|
||||
AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
|
||||
ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
|
||||
$(CONFIGURE_ENV)
|
||||
|
||||
##
|
||||
## Default rules
|
||||
##
|
||||
|
||||
# pkgconfig
|
||||
.if defined(PKGCONFIG)
|
||||
|
||||
PACKAGE_VERSION ?= `m4 ${DESTDIR}${X11BASE}/share/mk/package_version.m4 ${_SRCDIR}/configure.ac`
|
||||
|
||||
all: ${PKGCONFIG}
|
||||
|
||||
${PKGCONFIG}: ${PKGCONFIG}.in
|
||||
@sed -e 's#@prefix@#${X11BASE}#g' \
|
||||
-e 's#@datarootdir@#$${prefix}/share#g' \
|
||||
-e 's#@datadir@#$${datarootdir}#g' \
|
||||
-e 's#@exec_prefix@#$${prefix}#g' \
|
||||
-e 's#@libdir@#$${exec_prefix}/lib#g' \
|
||||
-e 's#@includedir@#$${prefix}/include#g' \
|
||||
-e 's#@PACKAGE_VERSION@#'${PACKAGE_VERSION}'#g' \
|
||||
${EXTRA_PKGCONFIG_SUBST} \
|
||||
< $? > $@
|
||||
|
||||
install-pc: ${PKGCONFIG}
|
||||
${INSTALL_DATA} ${PKGCONFIG} ${DESTDIR}${LIBDIR}/pkgconfig
|
||||
|
||||
clean-pc:
|
||||
rm -rf ${PKGCONFIG}
|
||||
|
||||
realinstall: install-pc
|
||||
|
||||
clean: clean-pc
|
||||
|
||||
|
||||
.endif
|
||||
|
||||
# headers
|
||||
.if defined(HEADERS)
|
||||
install-headers:
|
||||
@echo installing ${HEADERS} in ${INCSDIR}/${HEADERS_SUBDIR}
|
||||
@cd ${_SRCDIR}; for i in ${HEADERS}; do \
|
||||
cmp -s $$i ${DESTDIR}${INCSDIR}/${HEADERS_SUBDIR}$$i || \
|
||||
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/${HEADERS_SUBDIR}$$i;\
|
||||
done
|
||||
|
||||
realinstall: install-headers
|
||||
.endif
|
||||
.if defined(HEADERS_SUBDIRS)
|
||||
.for d in ${HEADERS_SUBDIRS}
|
||||
install-headers-subdirs::
|
||||
@echo installing ${HEADERS_${d:S/\//_/}} in ${INCSDIR}/${d}
|
||||
@cd ${_SRCDIR}; for i in ${HEADERS_${d:S/\//_/}}; do \
|
||||
cmp -s $$i ${DESTDIR}${INCSDIR}/$d/$$i || \
|
||||
${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/${d}; \
|
||||
done
|
||||
|
||||
realinstall: install-headers-subdirs
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
.if !target(.MAIN)
|
||||
.MAIN: all
|
||||
.endif
|
||||
|
||||
.if defined(SHARED_LIBS)
|
||||
_lt_libs=
|
||||
.for _n _v in ${SHARED_LIBS}
|
||||
_lt_libs+=lib${_n:S/+/_/g:S/-/_/g:S/./_/g}_ltversion=${_v}
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
.if !target(all)
|
||||
all: config.status
|
||||
@exec ${MAKE} ${_lt_libs}
|
||||
.endif
|
||||
|
||||
autoreconf:
|
||||
cd ${_SRCDIR}; ${AUTOTOOLS_ENV} exec autoreconf -v --install --force
|
||||
|
||||
.if !target(config.status)
|
||||
config.status:
|
||||
${CONFIGURE_ENV} PATH=$(XENOCARA_PATH) \
|
||||
exec sh ${_SRCDIR}/configure --prefix=${X11BASE} \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=${X11BASE}/man \
|
||||
${_cache} \
|
||||
${CONFIGURE_ARGS}
|
||||
.endif
|
||||
|
||||
.if !target(depend)
|
||||
depend:
|
||||
@echo "no dependencies here yet"
|
||||
.endif
|
||||
|
||||
.if !target(install)
|
||||
. if !target(beforeinstall)
|
||||
beforeinstall:
|
||||
. endif
|
||||
. if !target(afterinstall)
|
||||
afterinstall:
|
||||
. endif
|
||||
. if !target(realinstall)
|
||||
realinstall:
|
||||
exec ${MAKE} ${MAKE_FLAGS} ${_lt_libs} install
|
||||
.endif
|
||||
install: maninstall
|
||||
maninstall: afterinstall
|
||||
afterinstall: realinstall
|
||||
realinstall: beforeinstall
|
||||
.endif
|
||||
|
||||
.if !target(build)
|
||||
.if exists(Makefile.bsd-wrapper)
|
||||
_wrapper = -f Makefile.bsd-wrapper
|
||||
.endif
|
||||
.if defined(DESTDIR)
|
||||
build:
|
||||
@echo "cannot run make build with DESTDIR set"
|
||||
@exit 2
|
||||
.else
|
||||
build:
|
||||
cd ${.CURDIR} && \
|
||||
su ${BUILDUSER} -c 'exec ${MAKE} ${MAKE_FLAGS} ${_wrapper} cleandir' && \
|
||||
su ${BUILDUSER} -c 'exec ${MAKE} ${MAKE_FLAGS} ${_wrapper} all' && \
|
||||
exec ${MAKE} ${MAKE_FLAGS} ${_wrapper} install
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !target(clean) && ${MAKEFILE:T} != "Makefile"
|
||||
clean:
|
||||
-@if [ -f Makefile ]; then exec ${MAKE} clean; fi
|
||||
.endif
|
||||
|
||||
.if !target(cleandir)
|
||||
cleandir: clean
|
||||
-@if [ -f Makefile ]; then exec ${MAKE} distclean; fi
|
||||
-@if [ -f config.status ]; then \
|
||||
echo "rm config.status"; \
|
||||
rm -f config.status; \
|
||||
fi
|
||||
.endif
|
||||
|
||||
#
|
||||
# Obj dir rules for xenocara
|
||||
#
|
||||
.if !target(_xenocara_obj)
|
||||
. if defined(NOOBJ)
|
||||
_xenocara_obj:
|
||||
. else
|
||||
|
||||
. if defined(MAKEOBJDIR)
|
||||
__objdir= ${MAKEOBJDIR}
|
||||
. else
|
||||
__objdir= obj
|
||||
. endif
|
||||
|
||||
_SUBDIRUSE:
|
||||
|
||||
_xenocara_obj! _SUBDIRUSE
|
||||
@cd $(.CURDIR); \
|
||||
umask ${WOBJUMASK}; \
|
||||
here=`/bin/pwd`; xsrcdir=`cd $(XSRCDIR); /bin/pwd`; \
|
||||
subdir=$${here#$${xsrcdir}/}; \
|
||||
if [[ `id -u` -eq 0 && ${BUILDUSER} != root ]]; then \
|
||||
SETOWNER="chown -h ${BUILDUSER}:${WOBJGROUP}"; \
|
||||
if [[ $$here != $$subdir ]]; then \
|
||||
_mkdirs() { \
|
||||
su ${BUILDUSER} -c "mkdir -p $$1"; \
|
||||
}; \
|
||||
MKDIRS=_mkdirs; \
|
||||
fi; \
|
||||
elif [[ $$here == $$subdir ]]; then \
|
||||
SETOWNER="chown :${WOBJGROUP}"; \
|
||||
else \
|
||||
SETOWNER=:; \
|
||||
fi; \
|
||||
[[ -z $$MKDIRS ]] && MKDIRS="mkdir -p"; \
|
||||
if test $$here != $$subdir ; then \
|
||||
dest=${XOBJDIR}/$$subdir; \
|
||||
echo "$$here/${__objdir} -> $$dest"; \
|
||||
if test ! -L ${__objdir} -o \
|
||||
X`readlink ${__objdir}` != X$$dest; then \
|
||||
if test -e ${__objdir}; then rm -rf ${__objdir}; fi; \
|
||||
ln -sf $$dest ${__objdir}; \
|
||||
$$SETOWNER ${__objdir}; \
|
||||
fi; \
|
||||
if test -d ${XOBJDIR}; then \
|
||||
test -d $$dest || $$MKDIRS $$dest; \
|
||||
else \
|
||||
if test -e ${XOBJDIR}; then \
|
||||
echo "${XOBJDIR} is not a directory"; \
|
||||
else \
|
||||
echo "${XOBJDIR} does not exist"; \
|
||||
fi; \
|
||||
fi; \
|
||||
else \
|
||||
dest=$$here/${__objdir}; \
|
||||
if test ! -d ${__objdir}; then \
|
||||
echo "making $$dest"; \
|
||||
$$MKDIRS $$dest; \
|
||||
$$SETOWNER $$dest; \
|
||||
fi ; \
|
||||
fi
|
||||
. endif
|
||||
.endif
|
||||
|
||||
.if !target(obj)
|
||||
obj: _xenocara_obj
|
||||
.endif
|
||||
|
||||
.PHONY: _xenocara_obj
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
.include <bsd.own.mk>
|
||||
4
share/mk/package_version.m4
Normal file
4
share/mk/package_version.m4
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
dnl $OpenBSD: package_version.m4,v 1.1 2008/03/25 23:28:19 matthieu Exp $
|
||||
define(AC_INIT,`changequote([,])divert(0)'$2
|
||||
`divert(-1)')dnl
|
||||
divert(-1)dnl
|
||||
Loading…
Add table
Add a link
Reference in a new issue