diff options
| -rw-r--r-- | libs/liblo/Makefile | 29 | ||||
| -rw-r--r-- | net/frp/Makefile | 6 | ||||
| -rw-r--r-- | utils/swig/Makefile | 13 |
3 files changed, 23 insertions, 25 deletions
diff --git a/libs/liblo/Makefile b/libs/liblo/Makefile index 8a5b20f14..20d553695 100644 --- a/libs/liblo/Makefile +++ b/libs/liblo/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liblo PKG_VERSION:=0.31 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/liblo @@ -19,10 +19,13 @@ PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING -PKG_INSTALL:=1 +CMAKE_INSTALL:=1 +CMAKE_SOURCE_SUBDIR:=cmake PKG_BUILD_PARALLEL:=1 +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblo-utils include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk define Package/liblo/Default TITLE:=Lightweight Open Sound Control (OSC) @@ -45,21 +48,13 @@ $(call Package/liblo/Default) DEPENDS:= +liblo endef -CONFIGURE_ARGS += \ - $(if $(CONFIG_IPV6),--enable,--disable)-ipv6 \ - --enable-threads \ - --disable-examples \ - --disable-network-tests \ - --disable-tests - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lo $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblo.* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liblo.pc $(1)/usr/lib/pkgconfig/ -endef +CMAKE_OPTIONS += \ + -DWITH_TOOLS=O$(if $(CONFIG_PACKAGE_liblo-utils),N,FF) \ + -DWITH_TESTS=OFF \ + -DWITH_EXAMPLES=OFF \ + -DWITH_CPP_TESTS=OFF \ + -DWITH_STATIC=OFF \ + -DTHREADING=ON define Package/liblo/install $(INSTALL_DIR) $(1)/usr/lib diff --git a/net/frp/Makefile b/net/frp/Makefile index 5a26e80b5..b35baa209 100644 --- a/net/frp/Makefile +++ b/net/frp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frp -PKG_VERSION:=0.32.1 -PKG_RELEASE:=2 +PKG_VERSION:=0.33.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}? -PKG_HASH:=3a6ef59163f5a1d41b67908269e924000a8ccb2984e4bdfc18bd1405b5dbaf22 +PKG_HASH:=9c773ab4bbd208705c795599c5e69302a379734921c90489ed8ae331c24836cb PKG_MAINTAINER:=Richard Yu <yurichard3839@gmail.com> PKG_LICENSE:=Apache-2.0 diff --git a/utils/swig/Makefile b/utils/swig/Makefile index b931534ef..6624db10d 100644 --- a/utils/swig/Makefile +++ b/utils/swig/Makefile @@ -7,18 +7,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=swig -PKG_VERSION:=4.0.1 +PKG_VERSION:=4.0.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=7a00b4d0d53ad97a14316135e2d702091cd5f193bb58bcfcd8bc59d41e7887a9 -PKG_INSTALL:=1 +PKG_HASH:=d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Hirokazu MORIKAWA <morikw2@gmail.com> -PKG_LICENSE:=GPL-3.0 +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE +PKG_HOST_ONLY:=1 +HOST_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk @@ -26,10 +28,11 @@ define Package/swig SECTION:=libs CATEGORY:=Libraries TITLE:=swig binding generator + URL:=http://swig.org/ BUILDONLY:=1 endef -HOST_CONFIGURE_ARGS+= \ +HOST_CONFIGURE_ARGS += \ --without-pcre define Package/swig/description |