Remove hardcoded /usr/local from patch

Remove the need to edit pkg-plist on minor updates

Shorten install targets using loops

Realign added lines
This commit is contained in:
Chris Rees
2022-06-10 20:09:17 +01:00
parent 8c2b7770c2
commit a3c85ea916
3 changed files with 40 additions and 32 deletions

View File

@@ -75,6 +75,9 @@ CC?= clang
BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD} BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD}
SOVERSION= ${DISTVERSION}
PLIST_SUB= SOVERSION=${SOVERSION}
OPTIONS_DEFINE= CUDA OPENCL_SYCL ROCM XLA OPTIONS_DEFINE= CUDA OPENCL_SYCL ROCM XLA
OPTIONS_DEFAULT= AVX OPTIONS_DEFAULT= AVX
@@ -118,6 +121,11 @@ post-extract:
# here will be overwritten. Creation of this file is to satisfy checks. # here will be overwritten. Creation of this file is to satisfy checks.
@${TOUCH} ${WRKDIR}/THIRD_PARTY_TF_C_LICENSES @${TOUCH} ${WRKDIR}/THIRD_PARTY_TF_C_LICENSES
post-patch:
${REINPLACE_CMD} -e 's,%%PYTHON_CMD%%,${PYTHON_CMD},' \
-e 's,%%LOCALBASE%%,${LOCALBASE},' \
${WRKSRC}/.bazelrc
do-configure: do-configure:
@cd ${WRKSRC} && ${SETENV} \ @cd ${WRKSRC} && ${SETENV} \
CC_OPT_FLAGS="-I${LOCALBASE}/include -march=native -Wno-sign-compare" \ CC_OPT_FLAGS="-I${LOCALBASE}/include -march=native -Wno-sign-compare" \
@@ -126,11 +134,11 @@ do-configure:
PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \ PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \
TF_CONFIGURE_IOS=0 \ TF_CONFIGURE_IOS=0 \
TF_DOWNLOAD_CLANG=0 \ TF_DOWNLOAD_CLANG=0 \
TF_NEED_OPENCL_SYCL=${TF_NEED_OPENCL_SYCL} \ TF_NEED_OPENCL_SYCL=${TF_NEED_OPENCL_SYCL} \
TF_ENABLE_XLA=${TF_ENABLE_XLA} \ TF_ENABLE_XLA=${TF_ENABLE_XLA} \
TF_IGNORE_MAX_BAZEL_VERSION=0 \ TF_IGNORE_MAX_BAZEL_VERSION=0 \
TF_NEED_CUDA=${TF_ENABLE_CUDA} \ TF_NEED_CUDA=${TF_ENABLE_CUDA} \
TF_NEED_MPI=0 \ TF_NEED_MPI=0 \
TF_NEED_ROCM=${TF_ENABLE_ROCM} \ TF_NEED_ROCM=${TF_ENABLE_ROCM} \
TF_NEED_TENSORRT=0 \ TF_NEED_TENSORRT=0 \
TF_SET_ANDROID_WORKSPACE=0 \ TF_SET_ANDROID_WORKSPACE=0 \
@@ -140,12 +148,12 @@ do-build:
@cd ${WRKSRC} && ${LOCALBASE}/bin/bazel ${BAZEL_OPTS} build \ @cd ${WRKSRC} && ${LOCALBASE}/bin/bazel ${BAZEL_OPTS} build \
${BAZEL_ARGS} \ ${BAZEL_ARGS} \
--action_env=PATH=${PATH} \ --action_env=PATH=${PATH} \
--discard_analysis_cache \ --discard_analysis_cache \
--local_cpu_resources=${MAKE_JOBS_NUMBER} \ --local_cpu_resources=${MAKE_JOBS_NUMBER} \
--nokeep_state_after_build \ --nokeep_state_after_build \
--noshow_loading_progress \ --noshow_loading_progress \
--noshow_progress \ --noshow_progress \
--notrack_incremental_state \ --notrack_incremental_state \
--subcommands \ --subcommands \
--verbose_failures \ --verbose_failures \
//tensorflow/tools/lib_package:clicenses_generate \ //tensorflow/tools/lib_package:clicenses_generate \
@@ -155,38 +163,38 @@ do-test:
@cd ${WRKSRC} && ${LOCALBASE}/bin/bazel ${BAZEL_OPTS} test \ @cd ${WRKSRC} && ${LOCALBASE}/bin/bazel ${BAZEL_OPTS} test \
${BAZEL_ARGS} \ ${BAZEL_ARGS} \
--action_env=PATH=${PATH} \ --action_env=PATH=${PATH} \
--discard_analysis_cache \ --discard_analysis_cache \
--local_cpu_resources=${MAKE_JOBS_NUMBER} \ --local_cpu_resources=${MAKE_JOBS_NUMBER} \
--nokeep_state_after_build \ --nokeep_state_after_build \
--noshow_loading_progress \ --noshow_loading_progress \
--noshow_progress \ --noshow_progress \
--notrack_incremental_state \ --notrack_incremental_state \
--subcommands \ --subcommands \
--test_env=CC=${CC} \ --test_env=CC=${CC} \
--verbose_failures \ --verbose_failures \
//tensorflow/tools/lib_package:libtensorflow_test //tensorflow/tools/lib_package:libtensorflow_test
pre-install: pre-install:
@${CP} ${WRKSRC}/bazel-bin/tensorflow/tools/lib_package/THIRD_PARTY_TF_C_LICENSES ${WRKDIR}/THIRD_PARTY_TF_C_LICENSES ${CP} ${WRKSRC}/bazel-bin/tensorflow/tools/lib_package/THIRD_PARTY_TF_C_LICENSES \
@${MKDIR} ${WRKDIR}/lib_package ${WRKDIR}/THIRD_PARTY_TF_C_LICENSES
@tar xz -C ${WRKDIR}/lib_package -f ${WRKSRC}/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz ${MKDIR} ${WRKDIR}/lib_package
${MKDIR} ${STAGEDIR}${PREFIX}/include/tensorflow (cd ${WRKDIR}/lib_package && ${TAR} xvf \
${MKDIR} ${STAGEDIR}${PREFIX}/include/tensorflow/c ${WRKSRC}/bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz)
${MKDIR} ${STAGEDIR}${PREFIX}/include/tensorflow/c/eager ${MKDIR} ${STAGEDIR}${PREFIX}/include/tensorflow/c/eager
do-install: do-install:
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/c_api_experimental.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/c_api_experimental.h .for f in c_api_experimental.h c_api.h eager/c_api.h \
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/c_api.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/c_api.h tf_attrtype.h tf_datatype.h tf_status.h tf_tensor.h
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/eager/c_api.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/eager/c_api.h ${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/${f} \
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/tf_attrtype.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/tf_attrtype.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/${f}
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/tf_datatype.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/tf_datatype.h .endfor
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/tf_status.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/tf_status.h .for l in libtensorflow libtensorflow_framework
${INSTALL_DATA} ${WRKDIR}/lib_package/include/tensorflow/c/tf_tensor.h ${STAGEDIR}${PREFIX}/include/tensorflow/c/tf_tensor.h ${INSTALL_PROGRAM} ${WRKDIR}/lib_package/lib/${l}.so.${SOVERSION} \
${INSTALL_PROGRAM} ${WRKDIR}/lib_package/lib/libtensorflow.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtensorflow.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/
${INSTALL_PROGRAM} ${WRKDIR}/lib_package/lib/libtensorflow_framework.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtensorflow_framework.so.${DISTVERSION} ${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.so.${SOVERSION} \
@${RLN} ${STAGEDIR}${PREFIX}/lib/libtensorflow.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtensorflow.so.1 ${STAGEDIR}${PREFIX}/lib/${l}.so.1
@${RLN} ${STAGEDIR}${PREFIX}/lib/libtensorflow.so.1 ${STAGEDIR}${PREFIX}/lib/libtensorflow.so ${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.so.1 \
@${RLN} ${STAGEDIR}${PREFIX}/lib/libtensorflow_framework.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtensorflow_framework.so.1 ${STAGEDIR}${PREFIX}/lib/${l}.so
@${RLN} ${STAGEDIR}${PREFIX}/lib/libtensorflow_framework.so.1 ${STAGEDIR}${PREFIX}/lib/libtensorflow_framework.so .endfor
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@@ -28,13 +28,13 @@
+common:rbe_gpu_freebsd --config=rbe_gpu_linux +common:rbe_gpu_freebsd --config=rbe_gpu_linux
+ +
+build:rbe_freebsd_py2 --config=rbe_linux +build:rbe_freebsd_py2 --config=rbe_linux
+build:rbe_freebsd_py2 --repo_env=PYTHON_BIN_PATH="/usr/local/bin/python2" +build:rbe_freebsd_py2 --repo_env=PYTHON_BIN_PATH="%%LOCALBASE%%/bin/python2"
+build:rbe_freebsd_py2 --python_path="/usr/local/bin/python2" +build:rbe_freebsd_py2 --python_path="%%LOCALBASE%%/bin/python2"
+build:rbe_freebsd_py2 --repo_env=TF_PYTHON_CONFIG_REPO="@org_tensorflow//third_party/toolchains/preconfig/ubuntu16.04/py" +build:rbe_freebsd_py2 --repo_env=TF_PYTHON_CONFIG_REPO="@org_tensorflow//third_party/toolchains/preconfig/ubuntu16.04/py"
+ +
+build:rbe_freebsd_py3 --config=rbe_linux +build:rbe_freebsd_py3 --config=rbe_linux
+build:rbe_freebsd_py3 --repo_env=PYTHON_BIN_PATH="/usr/local/bin/python3" +build:rbe_freebsd_py3 --repo_env=PYTHON_BIN_PATH="%%PYTHON_CMD%%"
+build:rbe_freebsd_py3 --python_path="/usr/local/bin/python3" +build:rbe_freebsd_py3 --python_path="%%PYTHON_CMD%%"
+build:rbe_freebsd_py3 --repo_env=TF_PYTHON_CONFIG_REPO="@org_tensorflow//third_party/toolchains/preconfig/ubuntu16.04/py3" +build:rbe_freebsd_py3 --repo_env=TF_PYTHON_CONFIG_REPO="@org_tensorflow//third_party/toolchains/preconfig/ubuntu16.04/py3"
+ +
build:rbe_win --config=rbe build:rbe_win --config=rbe

View File

@@ -10,7 +10,7 @@ include/tensorflow/c/tf_status.h
include/tensorflow/c/tf_tensor.h include/tensorflow/c/tf_tensor.h
lib/libtensorflow.so lib/libtensorflow.so
lib/libtensorflow.so.1 lib/libtensorflow.so.1
lib/libtensorflow.so.1.15.5 lib/libtensorflow.so.%%SOVERSION%%
lib/libtensorflow_framework.so lib/libtensorflow_framework.so
lib/libtensorflow_framework.so.1 lib/libtensorflow_framework.so.1
lib/libtensorflow_framework.so.1.15.5 lib/libtensorflow_framework.so.%%SOVERSION%%