[pkgsrc/trunk]: pkgsrc/graphics fold "common" makefile fragments back into Me...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics fold "common" makefile fragments back into Me...
From: tnn <tnn%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 17:39:45 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/79ad56523da5
branches:  trunk
changeset: 649405:79ad56523da5
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Apr 03 02:24:16 2015 +0000

description:
fold "common" makefile fragments back into MesaLib/Makefile since
all previous consumers are now standalone.

diffstat:

 graphics/Mesa/Makefile.common  |  34 ------------------
 graphics/Mesa/Makefile.lib     |  64 ----------------------------------
 graphics/Mesa/Makefile.version |  15 -------
 graphics/MesaLib/Makefile      |  79 +++++++++++++++++++++++++++++++++++++++--
 4 files changed, 74 insertions(+), 118 deletions(-)

diffs (237 lines):

diff -r da428ec8cde4 -r 79ad56523da5 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common     Fri Apr 03 02:05:53 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile.common,v 1.76 2014/10/05 16:41:07 wiz Exp $
-#
-# This Makefile fragment is included either directly or indirectly (through
-# Makefile.lib) by all packages that are built from the Mesa sources.
-#
-# used by graphics/Mesa/Makefile.lib
-# used by graphics/glx-utils/Makefile
-
-.include "../../graphics/Mesa/Makefile.version"
-
-DISTNAME?=     ${MESA_DISTNAME}
-EXTRACT_SUFX=  .tar.bz2
-CATEGORIES=    graphics
-MASTER_SITES=  ${MESA_SITES}
-
-# When changing this version, please run "make distinfo" in the following
-# package directories:
-#
-#      graphics/MesaLib
-#      graphics/glx-utils
-#
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.mesa3d.org/
-
-WRKSRC=                        ${WRKDIR}/Mesa-${MESA_VERSION}
-DIST_SUBDIR=           Mesa-${MESA_PKGVERSION}
-
-BUILDLINK_API_DEPENDS.glproto+=        glproto>=1.4.11
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
diff -r da428ec8cde4 -r 79ad56523da5 graphics/Mesa/Makefile.lib
--- a/graphics/Mesa/Makefile.lib        Fri Apr 03 02:05:53 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile.lib,v 1.20 2015/02/14 06:54:14 riastradh Exp $
-#
-# This Makefile fragment is included by all packages that build libraries
-# from the Mesa sources.
-#
-# used by graphics/glu/Makefile
-# used by graphics/glut/Makefile
-# used by graphics/MesaDemos/Makefile
-# used by graphics/MesaLib/Makefile
-
-.include "../../graphics/Mesa/Makefile.common"
-
-DISTFILES+=    MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
-DISTFILES+=    MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX}
-#DISTFILES+=   MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
-
-GNU_CONFIGURE=         yes
-USE_LANGUAGES=         c99 c++
-USE_TOOLS+=            automake bison flex gmake pkg-config makedepend
-
-PYTHON_FOR_BUILD_ONLY=  tool
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 7.11.2
-.include "../../lang/python/tool.mk"
-BUILDLINK_DEPMETHOD.libxml2?=   build
-.include "../../textproc/libxml2/buildlink3.mk"
-
-PATCHDIR=              ${.CURDIR}/../MesaLib/patches
-DISTINFO_FILE=         ${.CURDIR}/../MesaLib/distinfo
-
-MAKE_ENV+=             MAKE=${GMAKE:Q}
-
-CONFIGURE_ARGS+=        --with-gallium-drivers=""
-CONFIGURE_ARGS+=        --disable-gallium-llvm
-CONFIGURE_ARGS+=        --disable-egl
-
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mccc)
-CFLAGS+=       -D__FUNCTION__=__FILE__
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "MirBSD"
-BUILDLINK_TRANSFORM+=  rm:-fvisibility=hidden
-.endif
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-# XXX This is not quite enough: we will need to patch the makefile
-# because it bogusly tries to reuse objects for native tools and target
-# libraries, and for cross-compiling the objects need to be built
-# separately.  Alternatively, we could just update Mesa to something
-# less prehistoric...
-SUBST_CLASSES+=                nativecc
-SUBST_STAGE.nativecc=  pre-configure
-SUBST_MESSAGE.nativecc=        Fix makefiles to compile tools with native cc.
-SUBST_FILES.nativecc+= src/glsl/Makefile
-SUBST_SED.nativecc+=   -e 's,$$(CC),$$(APP_CC),g'
-SUBST_SED.nativecc+=   -e 's,$$(CXX),$$(APP_CXX),g'
-MAKE_FLAGS+=           APP_CC=${NATIVE_CC:Q}
-MAKE_FLAGS+=           APP_CXX=${NATIVE_CXX:Q}
-.endif
-
-pre-configure:
-       cd ${WRKSRC} && ${MAKE} configure
diff -r da428ec8cde4 -r 79ad56523da5 graphics/Mesa/Makefile.version
--- a/graphics/Mesa/Makefile.version    Fri Apr 03 02:05:53 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile.version,v 1.9 2013/05/16 05:04:56 richard Exp $
-#
-# When changing this version, please run "make distinfo" in the following
-# package directories:
-#
-#      graphics/MesaLib
-#      graphics/glx-utils
-#
-# used by graphics/Mesa/Makefile.common
-
-MESA_DISTNAME=                 MesaLib-${MESA_VERSION}
-MESA_SITES=            ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
-
-MESA_VERSION=          7.11.2
-MESA_PKGVERSION=       ${MESA_VERSION}
diff -r da428ec8cde4 -r 79ad56523da5 graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Fri Apr 03 02:05:53 2015 +0000
+++ b/graphics/MesaLib/Makefile Fri Apr 03 02:24:16 2015 +0000
@@ -1,9 +1,30 @@
-# $NetBSD: Makefile,v 1.98 2015/03/09 19:54:44 tnn Exp $
+# $NetBSD: Makefile,v 1.99 2015/04/03 02:24:16 tnn Exp $
 
+DISTNAME?=     ${MESA_DISTNAME}
 PKGNAME=       MesaLib-${MESA_PKGVERSION}
 PKGREVISION=   6
+CATEGORIES=    graphics
+MASTER_SITES=  ${MESA_SITES}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.mesa3d.org/
 COMMENT=       Graphics library similar to SGI's OpenGL
 
+DISTFILES+=            MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
+DISTFILES+=            MesaGLUT-${MESA_VERSION}${EXTRACT_SUFX}
+#DISTFILES+=           MesaDemos-${MESA_VERSION}${EXTRACT_SUFX}
+MESA_DISTNAME=                 MesaLib-${MESA_VERSION}
+MESA_SITES=            ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
+MESA_VERSION=          7.11.2
+MESA_PKGVERSION=       ${MESA_VERSION}
+
+GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c99 c++
+USE_TOOLS+=            automake bison flex gmake pkg-config makedepend
+WRKSRC=                        ${WRKDIR}/Mesa-${MESA_VERSION}
+DIST_SUBDIR=           Mesa-${MESA_PKGVERSION}
+
 CONFLICTS+=    xf86driproto<2.0.4
 
 PLIST_VARS=            dri nodri
@@ -13,12 +34,47 @@
 PKGCONFIG_OVERRIDE+=   src/mesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=   src/glw/glw.pc.in
 
-CONFIGURE_ARGS+=        --disable-glu
-CONFIGURE_ARGS+=        --disable-glut
-CONFIGURE_ARGS+=        --disable-motif
+CONFIGURE_ARGS+=       --disable-glu
+CONFIGURE_ARGS+=       --disable-glut
+CONFIGURE_ARGS+=       --disable-motif
+CONFIGURE_ARGS+=       --with-gallium-drivers=""
+CONFIGURE_ARGS+=       --disable-gallium-llvm
+CONFIGURE_ARGS+=       --disable-egl
 
 .include "glx-config.mk"
-.include "../../graphics/Mesa/Makefile.lib"
+
+PYTHON_FOR_BUILD_ONLY=         tool
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 7.11.2
+
+MAKE_ENV+=             MAKE=${GMAKE:Q}
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mccc)
+CFLAGS+=       -D__FUNCTION__=__FILE__
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=  rm:-fvisibility=hidden
+.endif
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+# XXX This is not quite enough: we will need to patch the makefile
+# because it bogusly tries to reuse objects for native tools and target
+# libraries, and for cross-compiling the objects need to be built
+# separately.  Alternatively, we could just update Mesa to something
+# less prehistoric...
+SUBST_CLASSES+=                nativecc
+SUBST_STAGE.nativecc=  pre-configure
+SUBST_MESSAGE.nativecc=        Fix makefiles to compile tools with native cc.
+SUBST_FILES.nativecc+= src/glsl/Makefile
+SUBST_SED.nativecc+=   -e 's,$$(CC),$$(APP_CC),g'
+SUBST_SED.nativecc+=   -e 's,$$(CXX),$$(APP_CXX),g'
+MAKE_FLAGS+=           APP_CC=${NATIVE_CC:Q}
+MAKE_FLAGS+=           APP_CXX=${NATIVE_CXX:Q}
+.endif
+
 .include "options.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
@@ -50,6 +106,9 @@
 MAKE_ENV+=     CROSS_COMPILING=yes
 .endif
 
+pre-configure:
+       cd ${WRKSRC} && ${MAKE} configure
+
 post-extract:
 .if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS")
        ${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/
@@ -74,4 +133,14 @@
 BUILDLINK_TRANSFORM+=  rm:-fvisibility=hidden
 .endif
 
+.include "../../lang/python/tool.mk"
+BUILDLINK_DEPMETHOD.libxml2?=  build
+.include "../../textproc/libxml2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glproto+=        glproto>=1.4.11
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/p5-ExtUtils-CppGuess Update to 0.09
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/py-zmq to 14.4.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/p5-ExtUtils-CppGuess Update to 0.09
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/py-zmq to 14.4.1
Indexes:
Home | Main Index | Thread Index | Old Index