From nobody Sat Oct 05 03:09:32 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XL9PS47QQz5Ylwx; Sat, 05 Oct 2024 03:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XL9PS3bfCz43H3; Sat, 5 Oct 2024 03:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728097772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XN+v4dyfeyaDnK3eEV0PBJcoCyBn9SvWP1E7c4K03eM=; b=E5MHYZadwcRpvHUk17KjETzfiHC3z24k4nYfz6Zg9V6ck8mc9NrYfFtWEpm2mDO0XMAiAK 4zxln47CaqIvpu6BHmTMHAE9QR24FTvtzBSgzG/bFDRhFSBZdsxcfXWeidzSp65aysA00/ tDalQW37BwNZPXMYoH2eFBYvtNZpwKo4g9uWZtTorW++BcFVJwUZTJepWFzEyjQMLz95cf kmb50E4TP9lmh2H0lpdGqXcai04fLiRPX+6yx1UFpi6I4pchcAd9x4pVXukPWwBtNQBuzA YZ9KnW1QYWnC4KmYxlrgtxM7ih4bKMgs9BB5ebr3CMpAYOAMayGTrvwm+ry+wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728097772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XN+v4dyfeyaDnK3eEV0PBJcoCyBn9SvWP1E7c4K03eM=; b=wYCylz0d5JJBpnh364yxGZwf8T1Cx2HSZKV2gmHetrdw3as9QwhJuVjh4jlxAv/cCBOdeq oxu0zf0jXbLhhotqHlvpVN70ps82BY6cKsKqI6TsPnWHp4T2kXjI2bm0ELQxQA71xGEnxy LxdRwGhD4fI4ru9YByik1qCDMV1mtQ4tK1RIWv+dmuFAZW8q15NNNdwY0oQccLHbN+zK+s gJcE4x5A9E8PapI6o3E9Ay91TunduObaXlQtq67ZSIGAlAakp3ouc1J8k1Cll/39J4oQju bxRxjx7UYLw7alh0Fx2ud8upk8BdcFKy5D0a3bzjYZwYCNvfKJNbO3bJ/Hoyfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728097772; a=rsa-sha256; cv=none; b=V2o9fJLWPfigJKsUQV+BhpT5DWXVvNPGs2VUiO2DKs44uFd+D9JHS8YEEjAkVLoFStt2oa ExbVXvDFCKSmVnis8cSdNnLQz7jMjaZJXgvOtWLe6U4R4DRoRA+EBam3+GTA8rAx4UkuOW OxzSCUt2cYP9wiHNm36DM5Xojy0NJr3uSi6dUOfKKHV57EiMVjNNGwAH+dJVSsH10lC/Rv yD5JFxypMiUYmaw2Dh6TxYz0VaVlXuEtK6gDO98+ut/ryxRjIRZ4P2LcFlvMnrnU55Sx+u qAEKoghAlRsCpM9gsUN6Wahbjr7k8kSJjU4EgiLZJTbNAnGUDQWaFhCj6DqvHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XL9PS34b6z11xV; Sat, 5 Oct 2024 03:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49539Whx084224; Sat, 5 Oct 2024 03:09:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49539WQW084221; Sat, 5 Oct 2024 03:09:32 GMT (envelope-from git) Date: Sat, 5 Oct 2024 03:09:32 GMT Message-Id: <202410050309.49539WQW084221@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 592a706ae9a8 - main - databases/rocksdb-jni: Link with librocksdb.so at run-time; Add librocksdbjni-freebsd64.so symlink List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 592a706ae9a83b7aee91f0867a4ba70fa9575515 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=592a706ae9a83b7aee91f0867a4ba70fa9575515 commit 592a706ae9a83b7aee91f0867a4ba70fa9575515 Author: Yuri Victorovich AuthorDate: 2024-10-05 00:12:51 +0000 Commit: Yuri Victorovich CommitDate: 2024-10-05 03:09:25 +0000 databases/rocksdb-jni: Link with librocksdb.so at run-time; Add librocksdbjni-freebsd64.so symlink librocksdbjni-freebsd64.so is expected by at least Apache Pulse. --- databases/rocksdb-jni/Makefile | 8 +++++--- databases/rocksdb-jni/files/patch-CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/databases/rocksdb-jni/Makefile b/databases/rocksdb-jni/Makefile index 7ca22cffada1..53f7cc7f0bd9 100644 --- a/databases/rocksdb-jni/Makefile +++ b/databases/rocksdb-jni/Makefile @@ -1,6 +1,7 @@ PORTNAME= rocksdb-jni DISTVERSIONPREFIX= v DISTVERSION= 9.6.1 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://rocksdb-deps.s3-us-west-2.amazonaws.com/jars/:deps DISTFILES= assertj-core-2.9.0.jar:deps \ @@ -19,10 +20,10 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/../LICENSE.Apache LICENSE_FILE_GPLv2= ${WRKSRC}/../COPYING -BUILD_DEPENDS= rocksdb>0:databases/rocksdb \ - googletest>0:devel/googletest +BUILD_DEPENDS= googletest>0:devel/googletest +LIB_DEPENDS= librocksdb.so:databases/rocksdb # librocksdbjni.so in the rocksdb.jar file is linked to librocksdb.so -USES= cmake compiler:c++17-lang localbase +USES= cmake compiler:c++17-lang localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= facebook @@ -41,6 +42,7 @@ CMAKE_ARGS= -DCMAKE_PROJECT_VERSION=${DISTVERSION} \ CXXFLAGS+= -I${WRKSRC}/.. \ -DOS_FREEBSD \ -DROCKSDB_PLATFORM_POSIX +LDFLAGS+= -lrocksdb #MAKE_ENV+= JAVA_HOME=${JAVA_HOME} BINARY_ALIAS= java=${JAVA_HOME}/bin/java diff --git a/databases/rocksdb-jni/files/patch-CMakeLists.txt b/databases/rocksdb-jni/files/patch-CMakeLists.txt index c75e2ddd194a..d75b2084b004 100644 --- a/databases/rocksdb-jni/files/patch-CMakeLists.txt +++ b/databases/rocksdb-jni/files/patch-CMakeLists.txt @@ -1,3 +1,7 @@ +- this patch performs 2 functions: +- 1. remove java/ from the PROJECT_SOURCE_DIR path +- 2. add librocksdbjni-freebsd64.so symlink needed to run some dependencies + --- CMakeLists.txt.orig 2024-08-27 20:39:35 UTC +++ CMakeLists.txt @@ -542,9 +542,9 @@ include_directories(${JNI_INCLUDE_DIRS}) @@ -50,3 +54,14 @@ BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/${ROCKSDB_SOURCES_JAR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) +@@ -877,8 +877,10 @@ add_custom_target(rocksdbjava ALL + + add_custom_target(rocksdbjava ALL + COMMAND ${CMAKE_COMMAND} -E copy ${ROCKS_JAR_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${ROCKSDB_JAR} ++ COMMAND ln -s librocksdbjni.so librocksdbjni-freebsd64.so + COMMAND ${Java_JAR_EXECUTABLE} -uf ${CMAKE_CURRENT_BINARY_DIR}/${ROCKSDB_JAR} -C $ $ + COMMAND ${Java_JAR_EXECUTABLE} -uf ${CMAKE_CURRENT_BINARY_DIR}/${ROCKSDB_JAR} -C ${CMAKE_CURRENT_SOURCE_DIR} HISTORY-JAVA.md ++ COMMAND ${Java_JAR_EXECUTABLE} -uf ${CMAKE_CURRENT_BINARY_DIR}/${ROCKSDB_JAR} -C $ librocksdbjni-freebsd64.so + DEPENDS ${ROCKSDBJNI_STATIC_LIB} rocksdbjni_classes + BYPRODUCTS ${ROCKSDB_JAR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}