changeset 509:c1d0c003da7f default tip

tmp
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Fri, 29 Jul 2011 02:20:22 +0100
parents 428482e36de8
children
files components/hercules/Makefile components/hercules/patches/fix-autogen.patch make-rules/subversion.mk
diffstat 3 files changed, 120 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/hercules/Makefile	Fri Jul 29 02:20:22 2011 +0100
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		hercules
+COMPONENT_VCS_REV=	7623
+COMPONENT_VERSION=	3.07+svn$(COMPONENT_VCS_REV)
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_VCS_URL=	svn://svn.hercules-390.org/hercules/trunk
+
+COMPONENT_PRE_CONFIGURE_ACTION=(cd $(SOURCE_DIR); sh ./autogen.sh )
+
+include ../../make-rules/subversion.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/hercules/patches/fix-autogen.patch	Fri Jul 29 02:20:22 2011 +0100
@@ -0,0 +1,16 @@
+Index: autogen.sh
+===================================================================
+--- a/autogen.sh	(revision 7623)
++++ b/autogen.sh	(working copy)
+@@ -21,9 +21,9 @@
+ 
+ rm -f autogen.log
+ 
+-echo $ECHO_N "aclocal...    $ECHO_C" && aclocal -I m4 -I autoconf >>./autogen.log 2>&1 && echo "OK.  (25% done)" &&
++echo $ECHO_N "aclocal...    $ECHO_C" && aclocal-1.10 -I m4 -I autoconf >>./autogen.log 2>&1 && echo "OK.  (25% done)" &&
+ echo $ECHO_N "autoheader... $ECHO_C" && autoheader                >>./autogen.log 2>&1 && echo "OK.  (50% done)" &&
+-echo $ECHO_N "automake...   $ECHO_C" && automake                  >>./autogen.log 2>&1 && echo "OK.  (75% done)" &&
++echo $ECHO_N "automake...   $ECHO_C" && automake-1.10                  >>./autogen.log 2>&1 && echo "OK.  (75% done)" &&
+ echo $ECHO_N "autoconf...   $ECHO_C" && autoconf                  >>./autogen.log 2>&1 && echo "OK.  (100% done)"
+ 
+ R=$?
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/subversion.mk	Fri Jul 29 02:20:22 2011 +0100
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
+#
+
+CLEAN_PATHS += $(SOURCE_DIR)
+
+# In order to override PATCH_DIR and PATCH_PATTERN in component makefiles, they
+# need to be conditionally set here.  This means that the override needs to
+# happen prior to including subversion.mk.  Otherwise other variables set
+# here which are based on those will be expanded too early for the override
+# to take effect.  You also can't override PATCHES after including prep.mk;
+# if you want to append filenames to PATCHES, you'll have to set
+# $(EXTRA_PATCHES) prior to inclusion.
+PATCH_DIR ?=	patches
+PATCH_PATTERN ?=	*.patch
+PATCHES =	$(shell find $(PATCH_DIR) -type f -name '$(PATCH_PATTERN)' \
+				2>/dev/null | sort) $(EXTRA_PATCHES)
+STAMPS =	$(PATCHES:$(PATCH_DIR)/%=$(SOURCE_DIR)/.%ed)
+
+$(SOURCE_DIR)/.%ed:	$(PATCH_DIR)/%
+	$(GPATCH) -d $(@D) $(GPATCH_FLAGS) < $<
+	$(TOUCH) $@
+
+$(SOURCE_DIR): Makefile
+	svn checkout $(COMPONENT_VCS_URL)@$(COMPONENT_VCS_REV) $@
+
+$(SOURCE_DIR)/.patched: download Makefile $(PATCHES) $(STAMPS)
+	$(TOUCH) $@
+
+$(SOURCE_DIR)/.prep:	$(SOURCE_DIR)/.patched
+	$(COMPONENT_PREP_ACTION)
+	$(TOUCH) $@
+
+prep::	$(SOURCE_DIR)/.prep
+
+download::	$(SOURCE_DIR)
+
+clean::
+	$(RM) -r $(CLEAN_PATHS)
+
+clobber::	clean
+	$(RM) -r $(CLOBBER_PATHS)