mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #16644 from neheb/1m 

treewide: compile with tools/meson
This commit is contained in:
Rosen Penev 2021-09-18 01:33:04 -07:00 committed by GitHub
parent 9a172a52fb 468572af01
commit c24453484a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 50 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
devel/meson/Makefile
View File

@ -1,53 +0,0 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=meson
PKG_VERSION:=0.57.2
PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=meson
PKG_HASH:=3a83e7b1c5de94fa991ec34d9b198d94f38ed699d3524cb0fdf3b99fd23d4cc5
PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=COPYING
include ../../lang/python/pypi.mk
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-package.mk
define Host/Configure
endef
define Host/Compile
endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/meson
$(CP) $(HOST_BUILD_DIR)/* $(STAGING_DIR_HOSTPKG)/lib/meson/
endef
define Host/Clean
$(call Host/Clean/Default)
rm -rf $(STAGING_DIR_HOSTPKG)/lib/meson
endef
define Package/meson
SECTION:=devel
CATEGORY:=Development
TITLE:=meson
URL:=https://mesonbuild.com/
DEPENDS:=+ninja +python3-pkg-resources
endef
define Package/meson/description
Meson is an open source build system meant to be both extremely fast, and, even more importantly, as user friendly as possible.
endef
define Package/meson/install
endef
$(eval $(call HostBuild))
$(eval $(call Py3Package,meson))
$(eval $(call BuildPackage,meson))
$(eval $(call BuildPackage,meson-src))

147
devel/meson/meson.mk
View File

@ -1,147 +0,0 @@
# To build your package using meson:
#
# PKG_BUILD_DEPENDS:=meson/host
# include ../../devel/meson/meson.mk
# MESON_ARGS+=-Dfoo -Dbar=baz
#
# To pass additional environment variables to meson:
#
# MESON_VARS+=FOO=bar
#
# Default configure/compile/install targets are provided, but can be
# overwritten if required:
#
# define Build/Configure
# $(call Build/Configure/Meson)
# ...
# endef
#
# same for Build/Compile and Build/Install
#
# Host packages are built in the same fashion, just use these vars instead:
#
# HOST_BUILD_DEPENDS:=meson/host
# MESON_HOST_ARGS+=-Dfoo -Dbar=baz
# MESON_HOST_VARS+=FOO=bar
PKG_BUILD_PARALLEL ?= 1
HOST_BUILD_PARALLEL ?= 1
MESON_DIR:=$(STAGING_DIR_HOSTPKG)/lib/meson
MESON_HOST_BUILD_DIR:=$(HOST_BUILD_DIR)/openwrt-build
MESON_HOST_VARS:=
MESON_HOST_ARGS:=
MESON_BUILD_DIR:=$(PKG_BUILD_DIR)/openwrt-build
MESON_VARS:=
MESON_ARGS:=
ifneq ($(findstring i386,$(CONFIG_ARCH)),)
MESON_ARCH:="x86"
else ifneq ($(findstring powerpc64,$(CONFIG_ARCH)),)
MESON_ARCH:="ppc64"
else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
MESON_ARCH:="ppc"
else ifneq ($(findstring mips64el,$(CONFIG_ARCH)),)
MESON_ARCH:="mips64"
else ifneq ($(findstring mipsel,$(CONFIG_ARCH)),)
MESON_ARCH:="mips"
else ifneq ($(findstring armeb,$(CONFIG_ARCH)),)
MESON_ARCH:="arm"
else
MESON_ARCH:=$(CONFIG_ARCH)
endif
# this is undefined for just x64_64
ifeq ($(origin CPU_TYPE),undefined)
MESON_CPU:="generic"
else
MESON_CPU:="$(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))"
endif
define Meson
$(2) $(STAGING_DIR_HOST)/bin/$(PYTHON) $(MESON_DIR)/meson.py $(1)
endef
define Meson/CreateNativeFile
$(STAGING_DIR_HOST)/bin/sed \
-e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \
-e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \
-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
-e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@LDFLAGS@|$(foreach FLAG,$(HOST_LDFLAGS),'$(FLAG)',)|" \
-e "s|@PREFIX@|$(STAGING_DIR_HOSTPKG)|" \
< $(MESON_DIR)/openwrt-native.txt.in \
> $(1)
endef
define Meson/CreateCrossFile
$(STAGING_DIR_HOST)/bin/sed \
-e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \
-e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \
-e "s|@AR@|$(TARGET_AR)|" \
-e "s|@STRIP@|$(TARGET_CROSS)strip|" \
-e "s|@NM@|$(TARGET_NM)|" \
-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \
-e "s|@LDFLAGS@|$(foreach FLAG,$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS),'$(FLAG)',)|" \
-e "s|@ARCH@|$(MESON_ARCH)|" \
-e "s|@CPU@|$(MESON_CPU)|" \
-e "s|@ENDIAN@|$(if $(CONFIG_BIG_ENDIAN),big,little)|" \
< $(MESON_DIR)/openwrt-cross.txt.in \
> $(1)
endef
define Host/Configure/Meson
$(call Meson/CreateNativeFile,$(HOST_BUILD_DIR)/openwrt-native.txt)
$(call Meson, \
--native-file $(HOST_BUILD_DIR)/openwrt-native.txt \
$(MESON_HOST_ARGS) \
$(MESON_HOST_BUILD_DIR) \
$(HOST_BUILD_DIR), \
$(MESON_HOST_VARS))
endef
define Host/Compile/Meson
+$(NINJA) -C $(MESON_HOST_BUILD_DIR) $(1)
endef
define Host/Install/Meson
+$(NINJA) -C $(MESON_HOST_BUILD_DIR) install
endef
define Host/Uninstall/Meson
+$(NINJA) -C $(MESON_HOST_BUILD_DIR) uninstall
endef
define Build/Configure/Meson
$(call Meson/CreateNativeFile,$(PKG_BUILD_DIR)/openwrt-native.txt)
$(call Meson/CreateCrossFile,$(PKG_BUILD_DIR)/openwrt-cross.txt)
$(call Meson, \
--buildtype plain \
--native-file $(PKG_BUILD_DIR)/openwrt-native.txt \
--cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \
$(MESON_ARGS) \
$(MESON_BUILD_DIR) \
$(MESON_BUILD_DIR)/.., \
$(MESON_VARS))
endef
define Build/Compile/Meson
+$(NINJA) -C $(MESON_BUILD_DIR) $(1)
endef
define Build/Install/Meson
+DESTDIR="$(PKG_INSTALL_DIR)" $(NINJA) -C $(MESON_BUILD_DIR) install
endef
Host/Configure=$(call Host/Configure/Meson)
Host/Compile=$(call Host/Compile/Meson)
Host/Install=$(call Host/Install/Meson)
Host/Uninstall=$(call Host/Uninstall/Meson)
Build/Configure=$(call Build/Configure/Meson)
Build/Compile=$(call Build/Compile/Meson)
Build/Install=$(call Build/Install/Meson)

23
devel/meson/src/openwrt-cross.txt.in
View File

@ -1,23 +0,0 @@
[binaries]
c = [@CC@]
cpp = [@CXX@]
ar = '@AR@'
strip = '@STRIP@'
nm = '@NM@'
pkgconfig = '@PKGCONFIG@'
[built-in options]
c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@]
cpp_link_args = [@LDFLAGS@]
prefix = '/usr'
[host_machine]
system = 'linux'
cpu_family = '@ARCH@'
cpu = '@CPU@'
endian = '@ENDIAN@'
[properties]
needs_exe_wrapper = true

13
devel/meson/src/openwrt-native.txt.in
View File

@ -1,13 +0,0 @@
[binaries]
c = [@CC@]
cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@'
[built-in options]
c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@]
cpp_link_args = [@LDFLAGS@]
prefix = '@PREFIX@'
sbindir = 'bin'
libdir = 'lib'

3
devel/pkgconf/Makefile
View File

@ -18,10 +18,9 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libpkgconf
SECTION:=libs

4
libs/freetype/Makefile
View File

@ -20,10 +20,8 @@ PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later
PKG_LICENSE_FILES:=docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT src/bdf/README src/pcf/README src/gzip/zlib.h builds/unix/config.sub builds/unix/config.guess builds/unix/libtool
PKG_CPE_ID:=cpe:/a:freetype:freetype2
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libfreetype
SECTION:=libs

6
libs/glib2/Makefile
View File

@ -22,15 +22,15 @@ PKG_CPE_ID:=cpe:/a:gnome:glib
PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=meson/host gettext-full libiconv/host
HOST_BUILD_DEPENDS:=meson/host gettext-full/host libiconv/host libffi/host
PKG_BUILD_DEPENDS:=gettext-full libiconv/host
HOST_BUILD_DEPENDS:=gettext-full/host libiconv/host libffi/host
PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS
PKG_INSTALL:=1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/glib2
SECTION:=libs

4
libs/jose/Makefile
View File

@ -19,10 +19,8 @@ PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libjose
SECTION:=libs

4
libs/json-glib/Makefile
View File

@ -21,13 +21,13 @@ PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_BUILD_DEPENDS:=glib2/host meson/host
PKG_BUILD_DEPENDS:=glib2/host
OPENWRT_VERBOSE:=c
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/json-glib
SECTION:=libs

7
libs/jsoncpp/Makefile
View File

@ -19,13 +19,8 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
HOSTCC=$(HOSTCC_NOCACHE)
HOSTCXX=$(HOSTCXX_NOCACHE)
include $(INCLUDE_DIR)/meson.mk
define Package/jsoncpp
SECTION:=libs

3
libs/libdrm/Makefile
View File

@ -22,10 +22,9 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_LIBDRM_RADEON
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libdrm
SECTION:=libs

4
libs/libesmtp/Makefile
View File

@ -20,10 +20,8 @@ PKG_SOURCE_URL:=https://codeload.github.com/libesmtp/libESMTP/tar.gz/v$(PKG_VERS
PKG_HASH:=32bc3614ca12d21c7d933f32d43410e8744b6f91fdca7732da9877a385e4e6c3
PKG_BUILD_DIR:=$(BUILD_DIR)/libESMTP-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libesmtp
SECTION:=libs

3
libs/libevdev/Makefile
View File

@ -17,10 +17,9 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libevdev
SECTION:=libs

3
libs/libinput/Makefile
View File

@ -17,10 +17,9 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libinput
SECTION:=libs

3
libs/liblz4/Makefile
View File

@ -19,11 +19,10 @@ PKG_MAINTAINER:=Darik Horn <dajhorn@vanadac.com>
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=meson/host
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_lz4
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
MESON_BUILD_DIR:=$(PKG_BUILD_DIR)/contrib/meson/openwrt-build

3
libs/libmpdclient/Makefile
View File

@ -17,11 +17,10 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=meson/host
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libmpdclient
TITLE:=libmpdclient

3
libs/libpsl/Makefile
View File

@ -18,11 +18,10 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libpsl
SECTION:=libs

4
libs/libsoup/Makefile
View File

@ -18,12 +18,12 @@ PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gnome:libsoup
PKG_BUILD_DEPENDS:=meson/host glib2/host
PKG_BUILD_DEPENDS:=glib2/host
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libsoup
SECTION:=libs

3
libs/nlohmannjson/Makefile
View File

@ -18,10 +18,9 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE.MIT
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/nlohmannjson
SECTION:=libs

3
libs/p11-kit/Makefile
View File

@ -20,10 +20,9 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/p11-kit
SECTION:=libs

5
libs/pixman/Makefile
View File

@ -19,13 +19,10 @@ PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/pixman
SECTION:=libs

4
libs/spice-protocol/Makefile
View File

@ -18,11 +18,9 @@ PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/spice-protocol
SECTION:=libs

2
libs/spice/Makefile
View File

@ -24,7 +24,7 @@ PKG_BUILD_DEPENDS:=spice-protocol
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libspice-server
SECTION:=libs

3
multimedia/grilo-plugins/Makefile
View File

@ -18,11 +18,10 @@ PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/
PKG_HASH:=1c4305d67364a930543836cc1982f30e946973b8ff6af3efe31d87709ab520f8
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/grilo-plugins/Default
SECTION:=multimedia

2
multimedia/grilo/Makefile
View File

@ -22,7 +22,7 @@ PKG_BUILD_DEPENDS:=vala/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/grilo
SECTION:=multimedia

2
multimedia/gst1-libav/Makefile
View File

@ -108,7 +108,7 @@ PKG_CONFIG_DEPENDS:= \
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/gst1-libav
SECTION:=multimedia

2
multimedia/gst1-plugins-bad/Makefile
View File

@ -25,7 +25,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
GST_BAD_LIBS:=
GST_BAD_MODULES:=

2
multimedia/gst1-plugins-base/Makefile
View File

@ -26,7 +26,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_gst1-mod-alsa \

2
multimedia/gst1-plugins-good/Makefile
View File

@ -26,7 +26,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_gst1-mod-lame \

2
multimedia/gst1-plugins-ugly/Makefile
View File

@ -25,7 +25,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_gst1-mod-asf \

4
multimedia/gstreamer1/Makefile
View File

@ -23,11 +23,11 @@ PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gstreamer_project:gstreamer
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host glib2/host gettext-full/host
PKG_BUILD_DEPENDS:=glib2/host gettext-full/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/gstreamer1/Default
CATEGORY:=Multimedia

5
net/fastd/Makefile
View File

@ -43,11 +43,10 @@ PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_WITH_OFFLOAD_L2TP
PKG_BUILD_DEPENDS:=meson/host nacl
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=nacl
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/fastd
SECTION:=net

5
net/fastd/patches/0001-config-allow-disabling-L2TP-offload-when-fastd-doesn.patch
View File

@ -11,8 +11,6 @@ is not supported.
src/config.y | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/config.y b/src/config.y
index a107d7b9fda7..7a3ec6a32649 100644
--- a/src/config.y
+++ b/src/config.y
@@ -282,12 +282,14 @@ offload: TOK_L2TP boolean {
@ -33,6 +31,3 @@ index a107d7b9fda7..7a3ec6a32649 100644
#endif
}
;
--
2.32.0

3
net/iputils/Makefile
View File

@ -23,10 +23,9 @@ PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:iputils_project:iputils
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
MESON_ARGS += \
-DBUILD_MANS=false \

3
net/knot-resolver/Makefile
View File

@ -21,11 +21,10 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=GPL-3.0-later
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=meson/host
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/knot-resolver
SECTION:=net

3
net/lighttpd/Makefile
View File

@ -23,13 +23,12 @@ PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:lighttpd:lighttpd
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
PKG_CONFIG_DEPENDS:=CONFIG_LIGHTTPD_SSL $(patsubst %,CONFIG_PACKAGE_lighttpd-mod-%,$(REBUILD_MODULES))
REBUILD_MODULES=authn_gssapi authn_ldap authn_mysql cml magnet mysql_vhost trigger_b4_dl webdav
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/lighttpd/Default
SECTION:=net

2
net/sshfs/Makefile
View File

@ -23,7 +23,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/sshfs
TITLE:=SSHFS

3
sound/mpc/Makefile
View File

@ -17,11 +17,10 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=meson/host
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
MESON_ARGS+=-Diconv=disabled -Ddocumentation=disabled

2
sound/mpd/Makefile
View File

@ -26,7 +26,7 @@ PKG_USE_MIPS16:=0
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/mpd/Default
SECTION:=sound

3
sound/pulseaudio/Makefile
View File

@ -22,11 +22,10 @@ PKG_CPE_ID:=cpe:/a:pulseaudio:pulseaudio
PKG_INSTALL:=1
PKG_USE_MIPS16:=0
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/pulseaudio/Default
SECTION:=sound

3
utils/bonnie++/Makefile
View File

@ -20,10 +20,9 @@ PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=copyright.txt
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/bonniexx
SECTION:=utils

4
utils/conmon/Makefile
View File

@ -12,11 +12,11 @@ PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=golang/host meson/host
PKG_BUILD_DEPENDS:=golang/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/conmon
SECTION:=utils

3
utils/flashrom/Makefile
View File

@ -21,10 +21,9 @@ PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
include flashrom.mk
define Package/flashrom/default

2
utils/fontconfig/Makefile
View File

@ -24,7 +24,7 @@ PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=gperf/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/fontconfig
SECTION:=xorg-util

3
utils/fuse3/Makefile
View File

@ -21,10 +21,9 @@ PKG_MAINTAINER:=
PKG_CPE_ID:=cpe:/a:fuse_project:fuse
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/fuse3/Default
TITLE:=FUSE

2
utils/qemu/Makefile
View File

@ -23,7 +23,7 @@ PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_USE_MIPS16:=0
PKG_BUILD_DEPENDS+=spice-protocol meson/host
PKG_BUILD_DEPENDS+=spice-protocol
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/package.mk

3
utils/tang/Makefile
View File

@ -20,10 +20,9 @@ PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=meson/host
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
define Package/tang
SECTION:=utils

3
utils/zstd/Makefile
View File

@ -12,11 +12,10 @@ PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DEPENDS:=meson/host
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include ../../devel/meson/meson.mk
include $(INCLUDE_DIR)/meson.mk
MESON_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/build/meson/openwrt-build