diff options
| -rw-r--r-- | mk/cwrappers.mk | 10 | ||||
| -rw-r--r-- | pkgtools/cwrappers/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/cwrappers/files/bin/common.c | 6 | ||||
| -rw-r--r-- | pkgtools/cwrappers/files/doc/configuration.txt | 4 | ||||
| -rw-r--r-- | pkgtools/cwrappers/files/test/TODO | 2 | ||||
| -rw-r--r-- | pkgtools/cwrappers/files/test/setup_common.sh | 8 |
6 files changed, 17 insertions, 17 deletions
diff --git a/mk/cwrappers.mk b/mk/cwrappers.mk index 9344178d204..153a2f6c644 100644 --- a/mk/cwrappers.mk +++ b/mk/cwrappers.mk @@ -1,15 +1,15 @@ -# $NetBSD: cwrappers.mk,v 1.10 2014/11/27 20:34:55 joerg Exp $ +# $NetBSD: cwrappers.mk,v 1.11 2014/11/27 20:36:44 joerg Exp $ # # This Makefile fragment implements integration of pkgtools/cwrappers. -BUILD_DEPENDS+= cwrappers>=20100308:../../pkgtools/cwrappers +BUILD_DEPENDS+= cwrappers>=20141127:../../pkgtools/cwrappers CWRAPPERS_SRC_DIR= ${PREFIX}/libexec/cwrappers CWRAPPERS_BIN_DIR= ${WRKDIR}/.cwrapper/bin CWRAPPERS_CONFIG_DIR= ${WRKDIR}/.cwrapper/config -CONFIGURE_ENV+= WRAPPER_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR} -MAKE_ENV+= WRAPPER_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR} -ALL_ENV+= WRAPPER_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR} +CONFIGURE_ENV+= CWRAPPERS_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR} +MAKE_ENV+= CWRAPPERS_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR} +ALL_ENV+= CWRAPPERS_CONFIG_DIR=${CWRAPPERS_CONFIG_DIR} CWRAPPERS_CONFIG.as= as CWRAPPERS_CONFIG.cc= cc diff --git a/pkgtools/cwrappers/Makefile b/pkgtools/cwrappers/Makefile index cb7372d4570..78db6cec176 100644 --- a/pkgtools/cwrappers/Makefile +++ b/pkgtools/cwrappers/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2014/11/24 00:31:03 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2014/11/27 20:36:43 joerg Exp $ -PKGNAME= cwrappers-20100308 +PKGNAME= cwrappers-20141127 CATEGORIES= pkgtools sysutils MAINTAINER= joerg@NetBSD.org diff --git a/pkgtools/cwrappers/files/bin/common.c b/pkgtools/cwrappers/files/bin/common.c index bdad8e0c5d8..5a72eb6be37 100644 --- a/pkgtools/cwrappers/files/bin/common.c +++ b/pkgtools/cwrappers/files/bin/common.c @@ -1,4 +1,4 @@ -/* $NetBSD: common.c,v 1.1 2014/09/17 12:40:56 joerg Exp $ */ +/* $NetBSD: common.c,v 1.2 2014/11/27 20:36:43 joerg Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -173,9 +173,9 @@ parse_config(const char *wrapper) ssize_t llen; FILE *fp; - config_dir = getenv("WRAPPER_CONFIG_DIR"); + config_dir = getenv("CWRAPPERS_CONFIG_DIR"); if (config_dir == NULL) - errx(255, "WRAPPER_CONFIG_DIR is missing from environment"); + errx(255, "CWRAPPERS_CONFIG_DIR is missing from environment"); config_file = xasprintf("%s/%s", config_dir, wrapper); fp = fopen(config_file, "r"); diff --git a/pkgtools/cwrappers/files/doc/configuration.txt b/pkgtools/cwrappers/files/doc/configuration.txt index 49f8b59fc61..715c6055fdb 100644 --- a/pkgtools/cwrappers/files/doc/configuration.txt +++ b/pkgtools/cwrappers/files/doc/configuration.txt @@ -1,7 +1,7 @@ -$NetBSD: configuration.txt,v 1.1 2014/09/17 12:40:56 joerg Exp $ +$NetBSD: configuration.txt,v 1.2 2014/11/27 20:36:43 joerg Exp $ The configuration of the wrapper framework depends on two variables. -The environment variable WRAPPER_CONFIG_DIR points to a directory +The environment variable CWRAPPERS_CONFIG_DIR points to a directory with one configuration file per wrapper. The configuration file consists of simple key=value pairs. It is diff --git a/pkgtools/cwrappers/files/test/TODO b/pkgtools/cwrappers/files/test/TODO index e3d5926705d..a6428053cc7 100644 --- a/pkgtools/cwrappers/files/test/TODO +++ b/pkgtools/cwrappers/files/test/TODO @@ -1,4 +1,4 @@ -* Set WRAPPER_CONFIG_DIR to a test location, then look at work.log. +* Set CWRAPPERS_CONFIG_DIR to a test location, then look at work.log. * Hook in these old GSoC pkgsrc/pkgtools/wrapper tests. * Convert them to atf-c-api(3). * Add more tests for the rules described in doc/{cleanup,normalise}.txt. diff --git a/pkgtools/cwrappers/files/test/setup_common.sh b/pkgtools/cwrappers/files/test/setup_common.sh index 258da9460b8..1bfbc75aba0 100644 --- a/pkgtools/cwrappers/files/test/setup_common.sh +++ b/pkgtools/cwrappers/files/test/setup_common.sh @@ -4,21 +4,21 @@ wrapper_test_setup() { # variables available to tests WRAPPER="$(atf_get_srcdir)/../bin/${_wrappee}-wrapper" - WRAPPER_CONFIG_DIR=wrapperconfig; export WRAPPER_CONFIG_DIR - mkdir ${WRAPPER_CONFIG_DIR} + CWRAPPERS_CONFIG_DIR=wrapperconfig; export CWRAPPERS_CONFIG_DIR + mkdir ${CWRAPPERS_CONFIG_DIR} LOCALBASE=/local/base BUILDLINK_DIR=/wrksrc/build/link COMPILER_RPATH_FLAG="-Wl,-R" # or -L on Darwin, or... # minimal config file for test purposes - cat > ${WRAPPER_CONFIG_DIR}/${_wrappee} << EOF + cat > ${CWRAPPERS_CONFIG_DIR}/${_wrappee} << EOF worklog=/dev/null exec=echo transform=I:${LOCALBASE}:${BUILDLINK_DIR} EOF # plus any requested transforms while [ $# -gt 0 ]; do - echo "transform=$1" >> ${WRAPPER_CONFIG_DIR}/${_wrappee} + echo "transform=$1" >> ${CWRAPPERS_CONFIG_DIR}/${_wrappee} shift done |