pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: Drop find-prefix.mk -- build not fixed but clean works
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Jun 11 15:00:30 2016 +0200
Changeset: 7c47b7b762ac8380d7866ada9dbd6bfda22bb373
Modified Files:
gcc6snapshot/buildlink3.mk
gsview/Makefile
mk/pear-channel.mk
mpi-ch/buildlink3.mk
openmpi/buildlink3.mk
openmpi163/buildlink3.mk
pinkpony/Makefile
rstudio/Makefile
Log Message:
*: Drop find-prefix.mk -- build not fixed but clean works
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7c47b7b762ac8380d7866ada9dbd6bfda22bb373
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gcc6snapshot/buildlink3.mk | 4 ----
gsview/Makefile | 2 --
mk/pear-channel.mk | 3 ---
mpi-ch/buildlink3.mk | 3 ---
openmpi/buildlink3.mk | 8 --------
openmpi163/buildlink3.mk | 8 --------
pinkpony/Makefile | 3 ---
rstudio/Makefile | 5 -----
8 files changed, 36 deletions(-)
diffs:
diff --git a/gcc6snapshot/buildlink3.mk b/gcc6snapshot/buildlink3.mk
index e834e6e..a662c13 100644
--- a/gcc6snapshot/buildlink3.mk
+++ b/gcc6snapshot/buildlink3.mk
@@ -10,10 +10,6 @@ BUILDLINK_ABI_DEPENDS.gcc6snapshot+= gcc6>=6.0
BUILDLINK_PKGSRCDIR.gcc6snapshot= ../../wip/gcc6snapshot
BUILDLINK_DEPMETHOD.gcc6snapshot?= build
-FIND_PREFIX:= BUILDLINK_PREFIX.gcc6snapshot=gcc6snapshot
-.include "../../mk/find-prefix.mk"
-BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc6snapshot}/gcc6snapshot
-
BUILDLINK_FILES.gcc6snapshot= #empty
BUILDLINK_AUTO_VARS.gcc6snapshot= no
diff --git a/gsview/Makefile b/gsview/Makefile
index 4c347c2..a9a852b 100644
--- a/gsview/Makefile
+++ b/gsview/Makefile
@@ -18,8 +18,6 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
USE_TOOLS+= gmake pkg-config gs:run
-FIND_PREFIX:= PSTOTEXT_DIR=pstotext
-.include "../../mk/find-prefix.mk"
SUBST_CLASSES+= pstotext
SUBST_STAGE.pstotext= do-configure
SUBST_FILES.pstotext= srcunx/gvxdll.c
diff --git a/mk/pear-channel.mk b/mk/pear-channel.mk
index 7514d9e..011dde6 100644
--- a/mk/pear-channel.mk
+++ b/mk/pear-channel.mk
@@ -32,9 +32,6 @@ INSTALLATION_DIRS+= ${PEAR_CHANNELS_SUBDIR}
PEAR_CHANNEL_VERSION?= 1
-FIND_PREFIX:= PEARDIR=${PHP_PKG_PREFIX}-pear
-.include "../../mk/find-prefix.mk"
-
FILES_SUBST+= PEAR_CMD=${PEARDIR}/bin/pear
FILES_SUBST+= PEAR_CHANNELS_SUBDIR=${PEAR_CHANNELS_SUBDIR}
FILES_SUBST+= PEAR_CHANNEL=${PEAR_CHANNEL}
diff --git a/mpi-ch/buildlink3.mk b/mpi-ch/buildlink3.mk
index 68c0358..b66ab7d 100644
--- a/mpi-ch/buildlink3.mk
+++ b/mpi-ch/buildlink3.mk
@@ -8,9 +8,6 @@ MPICH_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mpich+= mpich>=3
BUILDLINK_PKGSRCDIR.mpich?= ../../wip/mpi-ch
-FIND_PREFIX:= BUILDLINK_PREFIX.mpich=mpich
-.include "../../mk/find-prefix.mk"
-
.include "../../parallel/openpa/buildlink3.mk"
.endif # MPICH_BUILDLINK3_MK
diff --git a/openmpi/buildlink3.mk b/openmpi/buildlink3.mk
index cf3c674..917b42d 100644
--- a/openmpi/buildlink3.mk
+++ b/openmpi/buildlink3.mk
@@ -8,14 +8,6 @@ OPENMPI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.openmpi+= openmpi>=1.5.1
BUILDLINK_PKGSRCDIR.openmpi?= ../../wip/openmpi
-MPI_PREFIX?= $(BUILDLINK_PREFIX.openmpi)
-FIND_PREFIX:= BUILDLINK_PREFIX.openmpi=openmpi
-
-# Make sure dependent ports use correct MPI compiler wrappers
-PREPEND_PATH+= $(MPI_PREFIX)/bin
-
-.include "../../mk/find-prefix.mk"
-
.include "../../parallel/hwloc/buildlink3.mk"
.endif # OPENMPI_BUILDLINK3_MK
diff --git a/openmpi163/buildlink3.mk b/openmpi163/buildlink3.mk
index 3b21879..540beaf 100644
--- a/openmpi163/buildlink3.mk
+++ b/openmpi163/buildlink3.mk
@@ -8,14 +8,6 @@ OPENMPI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.openmpi+= openmpi>=1.5.1
BUILDLINK_PKGSRCDIR.openmpi?= ../../wip/openmpi163
-MPI_PREFIX?= $(BUILDLINK_PREFIX.openmpi)
-FIND_PREFIX:= BUILDLINK_PREFIX.openmpi=openmpi
-
-# Make sure dependent ports use correct MPI compiler wrappers
-PREPEND_PATH+= $(MPI_PREFIX)/bin
-
-.include "../../mk/find-prefix.mk"
-
.include "../../parallel/hwloc/buildlink3.mk"
.endif # OPENMPI_BUILDLINK3_MK
diff --git a/pinkpony/Makefile b/pinkpony/Makefile
index a2bd776..72ecd25 100644
--- a/pinkpony/Makefile
+++ b/pinkpony/Makefile
@@ -18,8 +18,6 @@ WRKSRC= ${WRKDIR}/pink-pony
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-FIND_PREFIX:= SCONSDIR=scons
-
do-build:
cd ${WRKSRC} && env ${MAKE_ENV} ${SCONSDIR}/bin/scons prefix=${PREFIX}
@@ -33,5 +31,4 @@ do-install:
.include "../../wip/audiere/buildlink3.mk"
.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/devIL/buildlink3.mk"
-.include "../../mk/find-prefix.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/rstudio/Makefile b/rstudio/Makefile
index 86a948d..d9e95ea 100644
--- a/rstudio/Makefile
+++ b/rstudio/Makefile
@@ -28,11 +28,6 @@ USE_LANGUAGES= c c++
CMAKE_ARGS+= -DRSTUDIO_TARGET=Desktop
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
-FIND_PREFIX:= ANTDIR=apache-ant
-FIND_PREFIX+= GWTDIR=gwt
-FIND_PREFIX+= GINDIR=gin
-.include "../../mk/find-prefix.mk"
-
SUBST_CLASSES+= path
SUBST_STAGE.path= pre-configure
SUBST_MESSAGE.path= Fix pathes
Home |
Main Index |
Thread Index |
Old Index