diff options
| author | jperkin <jperkin> | 2015-11-25 12:50:57 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2015-11-25 12:50:57 +0000 |
| commit | 1d5f7fe5cc80833e968d867383b9f2b06e19b0b5 (patch) | |
| tree | 6e0f6dcdcaaa8431cd523c7b1458cc679eeb048c /inputmethod/mozc-server | |
| parent | 43680f8153e06ee0f2889fd8a929c68f80aa3bd6 (diff) | |
| download | pkgsrc-1d5f7fe5cc80833e968d867383b9f2b06e19b0b5.tar.gz | |
Remove mk/find-prefix.mk usage from the inputmethod category.
The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.
Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure. Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.
Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.
Diffstat (limited to 'inputmethod/mozc-server')
| -rw-r--r-- | inputmethod/mozc-server/Makefile.common | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common index 99411792a59..85e298124e2 100644 --- a/inputmethod/mozc-server/Makefile.common +++ b/inputmethod/mozc-server/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2015/10/12 07:24:50 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.22 2015/11/25 12:50:58 jperkin Exp $ # used by inputmethod/ibus-mozc/Makefile # used by inputmethod/mozc-elisp/Makefile # used by inputmethod/mozc-server/Makefile @@ -41,10 +41,6 @@ USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config -FIND_PREFIX:= GYPDIR=${PYPKGPREFIX}-gyp -#FIND_PREFIX:= NINJADIR=ninja -.include "../../mk/find-prefix.mk" - OPENSSL_CFLAGS= -I${BUILDLINK_PREFIX.openssl}/include OPENSSL_INC= -I${BUILDLINK_PREFIX.openssl}/include OPENSSL_LDFLAGS= -L${BUILDLINK_PREFIX.openssl}/lib -lssl -lcrypto @@ -85,7 +81,7 @@ do-configure: GYP_DEFINES="use_libprotobuf=1" \ ${PYTHONBIN} build_mozc.py \ gyp \ - --gypdir=${GYPDIR}/bin + --gypdir=${LOCALBASE}/bin .include "../../devel/glib2/buildlink3.mk" .include "../../devel/protobuf/buildlink3.mk" |