[pkgsrc/trunk]: pkgsrc/mk Add a mini-framework to centralise the handling of ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bf072fecd41
branches:  trunk
changeset: 483522:8bf072fecd41
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Nov 14 07:23:07 2004 +0000

description:
Add a mini-framework to centralise the handling of "hacks" for getting
particular packages to compile correctly.  bsd.hacks.mk auto-includes
the hacks.mk file in the current directory.  An example hacks file:

-------------8<-------------8<-------------8<-------------8<-------------
.if !defined(FOO_HACKS_MK)
FOO_HACKS_MK=   defined

### [Sun Nov 14 02:08:31 EST 2004 : jlam]
### arm GCC 2.95.x optimisation bug tickled when compiling
### lib/funkyfile.c.  Require a more recent version of GCC as a
### workaround and patch lib/funkyfile.c (patch-ae).
###
.if !empty(MACHINE_ARCH:Marm*)
PKG_HACKS+=     optimisation
GCC_REQD+=      3.0
.endif

.endif  # FOO_HACKS_MK
-------------8<-------------8<-------------8<-------------8<-------------

The comment which heads each individual hack should timestamp when the
hack was added and describe the bug that requires the hack.  By
separating out hacks to a separate file, we should be able to simplify
package Makefiles so that they are more readable.

diffstat:

 mk/bsd.hacks.mk |  71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mk/bsd.pkg.mk   |   5 +++-
 2 files changed, 75 insertions(+), 1 deletions(-)

diffs (94 lines):

diff -r 7270e4c13664 -r 8bf072fecd41 mk/bsd.hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/bsd.hacks.mk   Sun Nov 14 07:23:07 2004 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: bsd.hacks.mk,v 1.1 2004/11/14 07:23:07 jlam Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# This Makefile fragment automatically includes the necessary hacks to
+# make the package build correctly by including the package's hacks.mk
+# file if it exists.
+#
+# An example package hacks.mk:
+#
+# -------------8<-------------8<-------------8<-------------8<-------------
+# .if !defined(FOO_HACKS_MK)
+# FOO_HACKS_MK=        defined
+#
+# ### [Sun Nov 14 02:08:31 EST 2004 : jlam]
+# ### arm GCC 2.95.x optimisation bug tickled when compiling
+# ### lib/funkyfile.c.  Require a more recent version of GCC as a
+# ### workaround and patch lib/funkyfile.c (patch-ae).
+# ###
+# .if !empty(MACHINE_ARCH:Marm*)
+# PKG_HACKS+=  optimisation
+# GCC_REQD+=   3.0
+# .endif
+#
+# .endif  # FOO_HACKS_MK
+# -------------8<-------------8<-------------8<-------------8<-------------
+
+.include "../../mk/bsd.prefs.mk"
+
+PKG_HACKS?=    # empty
+
+.if exists(${.CURDIR}/hacks.mk)
+.  include "${.CURDIR}/hacks.mk"
+.endif
+
+# Record any package hacks that we use in the installed package.
+.if !empty(PKG_HACKS)
+BUILD_DEFS+=   PKG_HACKS
+.endif
diff -r 7270e4c13664 -r 8bf072fecd41 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Nov 14 06:17:18 2004 +0000
+++ b/mk/bsd.pkg.mk     Sun Nov 14 07:23:07 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1536 2004/11/12 20:25:41 sketch Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1537 2004/11/14 07:23:07 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -79,6 +79,9 @@
 MAKE_ENV+=     OBJECT_FMT="${OBJECT_FMT}"
 .endif
 
+# Include any hacks necessary for the package to build properly.
+.include "../../mk/bsd.hacks.mk"
+
 # Allow variables to be set on a per-OS basis
 OPSYSVARS+=    CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS
 .for _var_ in ${OPSYSVARS:O}