Skip to content

Commit 1c5eeae

Browse files
authored
abseil-cpp: Add changes from openwrt PR #25802 (#15)
1 parent 5d34ef6 commit 1c5eeae

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

depends/abseil-cpp/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=abseil-cpp
88
PKG_VERSION:=20240722.0
9-
PKG_RELEASE:=1
9+
PKG_RELEASE:=2
1010

1111
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1212
PKG_SOURCE_URL:=https://github.com/abseil/abseil-cpp/releases/download/$(PKG_VERSION)
@@ -35,17 +35,22 @@ endef
3535
CMAKE_INSTALL:=1
3636

3737
CMAKE_HOST_OPTIONS += \
38-
-DCMAKE_CXX_STANDARD=14 \
38+
-DABSL_PROPAGATE_CXX_STD=ON \
3939
-DABSL_ENABLE_INSTALL=ON \
4040
-DABSL_USE_GOOGLETEST_HEAD=OFF
4141

4242
CMAKE_OPTIONS += \
43-
-DCMAKE_CXX_STANDARD=14 \
43+
-DABSL_PROPAGATE_CXX_STD=ON \
4444
-DABSL_ENABLE_INSTALL=ON \
4545
-DABSL_USE_GOOGLETEST_HEAD=OFF
4646

4747
TARGET_CFLAGS += $(FPIC)
4848

49+
define Package/abseil-cpp/install
50+
$(INSTALL_DIR) $(1)/usr/lib
51+
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.a $(1)/usr/lib/
52+
endef
53+
4954
define Build/InstallDev
5055
$(call Build/InstallDev/cmake,$(1))
5156
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/absl_*.pc

0 commit comments

Comments
 (0)