Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13966 from neheb/mes56

Browse source 
meson: update to 0.56.0
This commit is contained in:
Rosen Penev 2020-11-25 14:21:31 -08:00 committed by GitHub
commit 25d6c075ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/meson/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=meson PKG_NAME:=meson
PKG_VERSION:=0.55.3 PKG_VERSION:=0.56.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PYPI_NAME:=meson PYPI_NAME:=meson
PKG_HASH:=6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 PKG_HASH:=291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213
PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com> PKG_MAINTAINER:=Andre Heider <a.heider@gmail.com>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

1
devel/meson/meson.mk
View file

@ -76,7 +76,6 @@ define Meson/CreateCrossFile
-e "s|@AR@|$(TARGET_AR)|" \ -e "s|@AR@|$(TARGET_AR)|" \
-e "s|@STRIP@|$(TARGET_CROSS)strip|" \ -e "s|@STRIP@|$(TARGET_CROSS)strip|" \
-e "s|@NM@|$(TARGET_NM)|" \ -e "s|@NM@|$(TARGET_NM)|" \
-e "s|@LD@|$(TARGET_CROSS)ld|" \
-e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \
-e "s|@CFLAGS@|$(foreach FLAG,$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \ -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|@CXXFLAGS@|$(foreach FLAG,$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS),'$(FLAG)',)|" \

8
devel/meson/src/openwrt-cross.txt.in
View file

@ -4,15 +4,13 @@ cpp = [@CXX@]
ar = '@AR@' ar = '@AR@'
strip = '@STRIP@' strip = '@STRIP@'
nm = '@NM@' nm = '@NM@'
ld = '@LD@'
pkgconfig = '@PKGCONFIG@' pkgconfig = '@PKGCONFIG@'
[properties] [built-in options]
c_args = [@CFLAGS@] c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@] c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@] cpp_args = [@CXXFLAGS@]
cpp_link_args = [@LDFLAGS@] cpp_link_args = [@LDFLAGS@]
needs_exe_wrapper = true
[host_machine] [host_machine]
system = 'linux' system = 'linux'
@ -20,6 +18,8 @@ cpu_family = '@ARCH@'
cpu = '@CPU@' cpu = '@CPU@'
endian = '@ENDIAN@' endian = '@ENDIAN@'
[properties]
needs_exe_wrapper = true
[paths] [paths]
prefix = '/usr' prefix = '/usr'
libdir = 'lib'

2
devel/meson/src/openwrt-native.txt.in
View file

@ -3,7 +3,7 @@ c = [@CC@]
cpp = [@CXX@] cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@' pkgconfig = '@PKGCONFIG@'
[properties] [built-in options]
c_args = [@CFLAGS@] c_args = [@CFLAGS@]
c_link_args = [@LDFLAGS@] c_link_args = [@LDFLAGS@]
cpp_args = [@CXXFLAGS@] cpp_args = [@CXXFLAGS@]