gnunet: changes towards cleanup, add more options, bl3

This commit is contained in:
ng0 2019-10-25 01:00:03 +00:00
parent 9416d113f5
commit 829534db31
4 changed files with 116 additions and 67 deletions

View File

@ -73,6 +73,7 @@ SUBST_SED.sysconfdir+= -e 's,^GNUNET_HOME.*,GNUNET_HOME = ${GNUNET_DIR},g'
# Some helpers and functionalities are only supported on
# some Operating Systems so far.
SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-testbed ${SETUID_ROOT_PERMS}
.if ${OPSYS} == "Linux"
# ${CHMOD} root:${GNUNETDNS_GROUP} ${DESTDIR}${PREFIX}/lib/gnunet/libexec/gnunet-helper-dns
# ${CHMOD} ${GNUNET_USER}:${GNUNETDNS_GROUP} ${DESTDIR}${PREFIX}/lib/gnunet/libexec/gnunet-service-dns
@ -83,13 +84,13 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-bluetooth $
SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-transport-wlan ${SETUID_ROOT_PERMS}
SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-vpn ${SETUID_ROOT_PERMS}
.endif
.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-client ${SETUID_ROOT_PERMS}
SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_ROOT_PERMS}
.endif
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/nss/buildlink3.mk"
@ -100,7 +101,6 @@ SPECIAL_PERMS+= ${PREFIX}/lib/gnunet/libexec/gnunet-helper-nat-server ${SETUID_R
.include "../../security/gnutls/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../textproc/libunistring/buildlink3.mk"
.include "../../textproc/jansson/buildlink3.mk"
.include "../../www/gnurl/buildlink3.mk"
.include "../../www/libmicrohttpd/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"

View File

@ -10,9 +10,10 @@ bin/gnunet-bugreport
bin/gnunet-cadet
bin/gnunet-config
bin/gnunet-consensus-profiler
${PLIST.experimental}bin/gnunet-conversation
${PLIST.experimental}bin/gnunet-conversation-test
${PLIST.conversations}bin/gnunet-conversation
${PLIST.conversations}bin/gnunet-conversation-test
bin/gnunet-core
${PLIST.experimental}bin/gnunet-credential
bin/gnunet-datastore
bin/gnunet-dht-get
bin/gnunet-dht-monitor
@ -213,10 +214,17 @@ lib/gnunet/libexec/gnunet-daemon-testbed-underlay
lib/gnunet/libexec/gnunet-daemon-topology
lib/gnunet/libexec/gnunet-dns2gns
lib/gnunet/libexec/gnunet-gns-proxy
${PLIST.experimental}lib/gnunet/libexec/gnunet-helper-audio-playback
${PLIST.experimental}lib/gnunet/libexec/gnunet-helper-audio-record
${PLIST.conversations}lib/gnunet/libexec/gnunet-helper-audio-playback
${PLIST.conversations}lib/gnunet/libexec/gnunet-helper-audio-record
${PLIST.linux}lib/gnunet/libexec/gnunet-helper-dns
${PLIST.linux}lib/gnunet/libexec/gnunet-helper-exit
lib/gnunet/libexec/gnunet-helper-fs-publish
${PLIST.linuxfreebsd}lib/gnunet/libexec/gnunet-helper-nat-client
${PLIST.linuxfreebsd}lib/gnunet/libexec/gnunet-helper-nat-server
lib/gnunet/libexec/gnunet-helper-testbed
${PLIST.bluez}lib/gnunet/libexec/gnunet-helper-transport-bluetooth
${PLIST.linux}lib/gnunet/libexec/gnunet-helper-transport-wlan
${PLIST.linux}lib/gnunet/libexec/gnunet-helper-vpn
lib/gnunet/libexec/gnunet-namestore-fcfsd
lib/gnunet/libexec/gnunet-rest-server
lib/gnunet/libexec/gnunet-service-arm
@ -225,8 +233,9 @@ lib/gnunet/libexec/gnunet-service-ats-new
${PLIST.experimental}lib/gnunet/libexec/gnunet-service-auction
lib/gnunet/libexec/gnunet-service-cadet
lib/gnunet/libexec/gnunet-service-consensus
${PLIST.experimental}lib/gnunet/libexec/gnunet-service-conversation
${PLIST.conversations}lib/gnunet/libexec/gnunet-service-conversation
lib/gnunet/libexec/gnunet-service-core
${PLIST.experimental}lib/gnunet/libexec/gnunet-service-credential
lib/gnunet/libexec/gnunet-service-datastore
lib/gnunet/libexec/gnunet-service-dht
lib/gnunet/libexec/gnunet-service-dns
@ -261,13 +270,9 @@ lib/gnunet/libexec/gnunet-service-zonemaster
lib/gnunet/libexec/gnunet-service-zonemaster-monitor
lib/gnunet/libexec/gnunet-timeout
lib/gnunet/libgnunet_plugin_ats2_simple.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.a
${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_mlp.so
lib/gnunet/libgnunet_plugin_ats_proportional.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.a
${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_ats_ril.so
lib/gnunet/libgnunet_plugin_block_consensus.la
lib/gnunet/libgnunet_plugin_block_dht.la
lib/gnunet/libgnunet_plugin_block_dns.la
@ -278,27 +283,20 @@ lib/gnunet/libgnunet_plugin_block_revocation.la
lib/gnunet/libgnunet_plugin_block_set_test.la
lib/gnunet/libgnunet_plugin_block_test.la
lib/gnunet/libgnunet_plugin_datacache_heap.la
lib/gnunet/libgnunet_plugin_datacache_sqlite.la
${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_datacache_sqlite.la
lib/gnunet/libgnunet_plugin_datastore_heap.la
lib/gnunet/libgnunet_plugin_datastore_sqlite.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.a
${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.so
${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_datastore_sqlite.la
${PLIST.conversations}lib/gnunet/libgnunet_plugin_gnsrecord_conversation.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_gnsrecord_credential.la
lib/gnunet/libgnunet_plugin_gnsrecord_dns.la
lib/gnunet/libgnunet_plugin_gnsrecord_gns.la
lib/gnunet/libgnunet_plugin_gnsrecord_reclaim.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.a
${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_namecache_flat.so
lib/gnunet/libgnunet_plugin_namecache_sqlite.la
lib/gnunet/libgnunet_plugin_namestore_flat.a
${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_namecache_sqlite.la
lib/gnunet/libgnunet_plugin_namestore_flat.la
lib/gnunet/libgnunet_plugin_namestore_flat.so
lib/gnunet/libgnunet_plugin_namestore_sqlite.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.a
${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_namestore_sqlite.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_peerstore_flat.so
lib/gnunet/libgnunet_plugin_peerstore_sqlite.la
${PLIST.sqlite3}lib/gnunet/libgnunet_plugin_peerstore_sqlite.la
lib/gnunet/libgnunet_plugin_reclaim_attribute_gnuid.la
lib/gnunet/libgnunet_plugin_rest_config.la
lib/gnunet/libgnunet_plugin_rest_copying.la
@ -316,12 +314,6 @@ lib/gnunet/libgnunet_plugin_transport_https_server.la
lib/gnunet/libgnunet_plugin_transport_tcp.la
lib/gnunet/libgnunet_plugin_transport_udp.la
lib/gnunet/libgnunet_plugin_transport_unix.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xt.a
${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xt.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xt.so
${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xu.a
${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xu.la
${PLIST.experimental}lib/gnunet/libgnunet_plugin_transport_xu.so
lib/libgnunetarm.la
lib/libgnunetats.la
lib/libgnunetatsapplication.la
@ -331,12 +323,9 @@ lib/libgnunetblock.la
lib/libgnunetblockgroup.la
lib/libgnunetcadet.la
lib/libgnunetconsensus.la
${PLIST.experimental}lib/libgnunetconversation.a
${PLIST.experimental}lib/libgnunetconversation.la
${PLIST.experimental}lib/libgnunetconversation.so
${PLIST.experimental}lib/libgnunetconversation.so.0
${PLIST.experimental}lib/libgnunetconversation.so.0.0.0
${PLIST.conversations}lib/libgnunetconversation.la
lib/libgnunetcore.la
${PLIST.experimental}lib/libgnunetcredential.la
lib/libgnunetcurl.la
lib/libgnunetdatacache.la
lib/libgnunetdatastore.la
@ -349,12 +338,8 @@ lib/libgnunetgns.la
lib/libgnunetgnsrecord.la
lib/libgnunethello.la
lib/libgnunetidentity.la
lib/libgnunetjson.la
${PLIST.experimental}lib/libgnunetmicrophone.a
${PLIST.experimental}lib/libgnunetmicrophone.la
${PLIST.experimental}lib/libgnunetmicrophone.so
${PLIST.experimental}lib/libgnunetmicrophone.so.0
${PLIST.experimental}lib/libgnunetmicrophone.so.0.0.0
${PLIST.json}lib/libgnunetjson.la
${PLIST.conversations}lib/libgnunetmicrophone.la
lib/libgnunetnamecache.la
lib/libgnunetnamestore.la
lib/libgnunetnatauto.la
@ -369,19 +354,11 @@ lib/libgnunetregex.la
lib/libgnunetregexblock.la
lib/libgnunetrest.la
lib/libgnunetrevocation.la
${PLIST.experimental}lib/libgnunetrps.a
${PLIST.experimental}lib/libgnunetrps.la
${PLIST.experimental}lib/libgnunetrps.so
${PLIST.experimental}lib/libgnunetrps.so.0
${PLIST.experimental}lib/libgnunetrps.so.0.0.0
lib/libgnunetscalarproduct.la
lib/libgnunetsecretsharing.la
lib/libgnunetset.la
${PLIST.experimental}lib/libgnunetspeaker.a
${PLIST.experimental}lib/libgnunetspeaker.la
${PLIST.experimental}lib/libgnunetspeaker.so
${PLIST.experimental}lib/libgnunetspeaker.so.0
${PLIST.experimental}lib/libgnunetspeaker.so.0.0.0
${PLIST.conversations}lib/libgnunetspeaker.la
lib/libgnunetsq.la
lib/libgnunetstatistics.la
lib/libgnunettestbed.la
@ -487,8 +464,9 @@ ${PLIST.experimental}share/gnunet/config.d/auction.conf
share/gnunet/config.d/cadet.conf
share/gnunet/config.d/communicator-unix.conf
share/gnunet/config.d/consensus.conf
${PLIST.experimental}share/gnunet/config.d/conversation.conf
${PLIST.conversations}share/gnunet/config.d/conversation.conf
share/gnunet/config.d/core.conf
${PLIST.experimental}share/gnunet/config.d/credential.conf
share/gnunet/config.d/datacache.conf
share/gnunet/config.d/datastore.conf
share/gnunet/config.d/dht.conf

View File

@ -11,8 +11,12 @@ BUILDLINK_PKGSRCDIR.gnunet?= ../../wip/gnunet
pkgbase:= gnunet
.include "../../mk/pkg-build-options.mk"
#.include "../../audio/libopus/buildlink3.mk"
.if !empty(PKG_OPTIONS:Mopus)
.include "../../audio/libopus/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msqlite3)
.include "../../databases/sqlite3/buildlink3.mk"
.endif
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/nss/buildlink3.mk"
@ -20,16 +24,33 @@ pkgbase:= gnunet
.include "../../devel/libextractor/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
#.include "../../multimedia/gstreamer1/buildlink3.mk"
#.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
#.include "../../multimedia/libogg/buildlink3.mk"
.if !empty(PKG_OPTIONS:Midn)
.include "../../devel/libidn2/buildlink3.mk"
.else
.include "../../devel/libidn/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mtests)
.include "../../lang/python/tool.mk"
.endif
.if !empty(PKG_OPTIONS:Mgstreamer)
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mogg)
.include "../../multimedia/libogg/buildlink3.mk"
.endif
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/libunistring/buildlink3.mk"
.if !empty(PKG_OPTIONS:Mjson)
.include "../../textproc/jansson/buildlink3.mk"
.endif
.include "../../www/gnurl/buildlink3.mk"
.include "../../www/libmicrohttpd/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mbluez)
.include "../../wip/bluez-libs/buildlink3.mk"
.endif
.endif # GNUNET_BUILDLINK3_MK
BUILDLINK_TREE+= -gnunet

View File

@ -1,10 +1,16 @@
# $NetBSD$
PKG_OPTIONS_VAR= PKG_OPTIONS.gnunet
PKG_SUPPORTED_OPTIONS= doc mdoc idn mysql pgsql tests experimental bluez
PKG_SUGGESTED_OPTIONS= mdoc
PLIST_VARS+= doc mdoc
PLIST_VARS+= experimental
PKG_SUPPORTED_OPTIONS+= doc mdoc idn mysql pgsql tests
PKG_SUPPORTED_OPTIONS+= experimental bluez pulseaudio
PKG_SUPPORTED_OPTIONS+= opus ogg sqlite3 json
PKG_SUPPORTED_OPTIONS+= gstreamer
PKG_SUGGESTED_OPTIONS= doc sqlite3 json
PLIST_VARS+= doc mdoc conversations
PLIST_VARS+= experimental json
PLIST_VARS+= pgsql mysql sqlite3
PLIST_VARS+= linux freebsd bluez
PLIST_VARS+= linuxfreebsd
# openssl is currently required by:
# src/transport/gnunet-transport-certificate-creation
# src/gns/gnunet-gns-proxy-setup-ca
@ -16,7 +22,6 @@ PLIST_VARS+= experimental
PYTHON_FOR_BUILD_ONLY= yes
.endif
# build the doc output. XXX: See README.
.if !empty(PKG_OPTIONS:Mdoc)
USE_TOOLS+= makeinfo
INFO_FILES= yes
@ -45,28 +50,60 @@ CONFIGURE_ARGS+= --with-libidn2=${BUILDLINK_PREFIX.libidn2}
CONFIGURE_ARGS+= --with-libidn=${BUILDLINK_PREFIX.libidn}
.endif
.if !empty(PKG_OPTIONS:Mjson)
.include "../../textproc/jansson/buildlink3.mk"
CONFIGURE_ARGS+= --with-jansson=${BUILDLINK_PREFIX.jansson}
PLIST.json= yes
.else
CONFIGURE_ARGS+= --without-jansson
.endif
# database support - they don't exclude other databases,
# you can have mysql, pgsql, and the default all built in.
# ideally we would check for at least sqlite3 existing, but
# the build won't build when you have none of them.
.if !empty(PKG_OPTIONS:Msqlite3)
.include "../../databases/sqlite3/buildlink3.mk"
PLIST.sqlite3= yes
.endif
.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
PLIST.mysql= yes
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
PLIST.pgsql= yes
.endif
# Experimental
.if !empty(PKG_OPTIONS:Mexperimental)
.include "../../audio/libopus/buildlink3.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../math/glpk/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
CONFIGURE_ARGS+= --enable-experimental
PLIST.experimental= yes
.endif
.if !empty(PKG_OPTIONS:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
PLIST.conversations= yes
.endif
.if !empty(PKG_OPTIONS:Mopus)
.include "../../audio/libopus/buildlink3.mk"
PLIST.conversations= yes
.endif
.if !empty(PKG_OPTIONS:Mogg)
.include "../../multimedia/libogg/buildlink3.mk"
PLIST.conversations= yes
.endif
.if !empty(PKG_OPTIONS:Mgstreamer)
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
PLIST.conversations= yes
.endif
# FIXME: It would be good to provide a build of gnunet against
# 'gnutls build against libdane/unbound' iff unbound is selected,
# causing consequentially a build of gnutls with this setting.
@ -80,4 +117,17 @@ PLIST.experimental= yes
.if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mbluez)
# Do we need more for bluez?
.include "../../wip/bluez-libs/buildlink3.mk"
PLIST.bluez= yes
.endif
.if ${OPSYS} == "Linux"
PLIST.linux= yes
.endif
.if ${OPSYS} == "FreeBSD"
PLIST.freebsd= yes
.endif
.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
PLIST.linuxfreebsd= yes
.endif