Commit Graph

29 Commits

Author SHA1 Message Date
Rosen Penev 2e654b19f3 treewide: back to cmake.mk
Ninja was merged to base and therefore we can now use normal cmake.mk

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-06-12 21:05:01 -07:00
Rosen Penev 1d0d8e057c protobuf: update to 3.15.6
Remove upstreamed patch.

Switch to AUTORELEASE for simplicity.

Switch to building with Ninja for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-03-20 17:28:09 -07:00
Rosen Penev 457dcc5d5b
protobuf: fix bad CFLAGS in pkgconfig
Issue shows itself when using clang.

Refreshed other patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-12-17 22:02:30 -08:00
Rosen Penev 2b2fa695bb
protobuf: update to 3.14.0
Remove pointless CMAKE_INSTALL. There's an InstallDev section.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-12-01 16:18:37 -08:00
Bruno Randolf 66ace3b968 protobuf: Update to version 3.13.0
Signed-off-by: Bruno Randolf <br1@einfach.org>
2020-11-02 15:30:37 +00:00
Rosen Penev ee2e3915f0
protobuf: link against libm under glibc
Fixes compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-26 20:29:25 -08:00
Sebastian Kemper 956b2706f2 protobuf: fix libdir handling for host build
On some host machines (example: Gentoo amd64 no-multilib) by default
cmake will install libraries to lib64. But in OpenWrt the correct libdir
is lib (for instance the RPATH is set to lib). So you may end up with
libraries in lib64 while RPATH points to lib:

sk@darth ~/tmp/openwrt $ ldd staging_dir/hostpkg/bin/protoc
	linux-vdso.so.1 (0x00007ffc741ea000)
	libprotoc.so.3.8.0.0 => not found
	libprotobuf.so.3.8.0.0 => not found
	libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f0a8f7ea000)
	libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/libstdc++.so.6 (0x00007f0a8f572000)
	libm.so.6 => /lib64/libm.so.6 (0x00007f0a8f427000)
	libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/libgcc_s.so.1 (0x00007f0a8f40d000)
	libc.so.6 => /lib64/libc.so.6 (0x00007f0a8f23c000)
	/lib64/ld-linux-x86-64.so.2 (0x00007f0a8f827000)
sk@darth ~/tmp/openwrt $

Fix this by specifying the libdir during host builds.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-12-14 12:26:08 +01:00
Rosen Penev a6529c2ac2
protobuf: Fix rpath
protobuf was setting its own rpath, preventing the build system from
overriding it. Comment it out.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-09-25 21:59:02 -07:00
Rosen Penev b50ee9b45e
Merge pull request #10062 from ja-pa/treewide-cpe-id-2
treewide: add PKG_CPE_ID for cvescanner
2019-09-24 15:03:31 -07:00
Jan Pavlinec ceadbcbb64
treewide: add PKG_CPE_ID for cvescanner
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-24 13:51:22 +02:00
Rosen Penev e8da6d9294
protobuf: Fix host build
rpath is needed as the host directory instead of hostpkg is used for some
reason.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-09-23 14:56:18 -07:00
Rosen Penev 0350a15716
protobuf: Switch to CMake
Allows PKG_BUILD_PARALLEL to work properly.

Replaced InstallDev section with CMAKE_INSTALL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-09-16 16:34:23 -07:00
Rosen Penev 1e65a8b5d0 protobuf: Update to 3.8.0
Small Makefile cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-06-23 14:13:55 -07:00
Rosen Penev 9038da616d
protobuf: Update to 3.7.1
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-05 16:41:20 -07:00
Ken Keys 07daa086e6 protobuf: upgrade to version 3.5.1
Signed-off-by: Ken Keys <kkeys@caida.org>
2018-05-23 16:39:29 -07:00
Ken Keys d078dbed7b protobuf: add smaller protobuf-lite package variant
Signed-off-by: Ken Keys <kkeys@caida.org>
2018-05-23 16:37:35 -07:00
Etienne Champetier 173c9b0c3d protobuf: fix PKG_HASH
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-09-22 21:53:33 -07:00
Hamid Ebadi 322b949416 protobuf: Fixing sha256 hash
Signed-off-by: Hamid Ebadi <hamid.ebadi@gmail.com>
2017-09-21 00:14:17 +08:00
Etienne Champetier 4006865ae8 treewide: run "make check FIXUP=1"
fix Makefile chmod (644)
replace MD5SUM with HASH
add PKG_MIRROR_HASH when PKG_SOURCE_PROTO:=git

(PKG_SOURCE_PROTO:=svn tarballs are not reproducible for now)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-08-29 21:41:14 -07:00
Per Sandström 37004c5061 protobuf: upgrade to version 3.3
Signed-off-by: Per Sandström <per.j.sandstrom@gmail.com>
2017-05-02 20:30:04 +02:00
Per Sandström adc1964575 Protobuf: Upgrade to version 3.1
Signed-off-by: Per Sandström <per.j.sandstrom@gmail.com>
2017-02-11 13:13:48 +01:00
Matthias Schiffer 4a984a8d60
treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely
on it. See 73b7f55424 for more information on
STAGING_DIR_HOSTPKG.

STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release
(it is equivalent to $(STAGING_DIR)/host), so this simple search/replace
cleanup is safe to apply. Doing this cleanup now will be useful for the
Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting
with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream.

Also fixes a typo in the dbus Makefile ("STAGIND_DIR").

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-01-10 18:25:54 +01:00
Felix Fietkau 9f8e5aca34 treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
2016-01-20 21:56:03 +01:00
Jacob Siverskog 433880cc1d protobuf: add myself as maintainer.
Signed-off-by: Jacob Siverskog <jacob@teenageengineering.com>
2015-08-21 09:46:53 +02:00
Guillaume Déflache 869bab445d protobuf: Update version to 2.6.1
- Unbroke MIPS support which got entirely lost since the upgrade from 2.4.1:
  now all ISAs should work (MIPS1 would need kernel emulation though, untested)
- Fixed host installation which was broken on all targets
- Updated source origin to github and related variables
- Kept mipseb patch exception and MIPS16:=0 exclusion (needed for BB and CC compilation)

Only tested on a ZyXEL NBG6716 router which is MIPS32 (MIPS74Kc), ar71xx target.

Signed-off-by: Guillaume Déflache <guillaume.deflache@ibwag.com>
2015-05-21 14:41:23 +02:00
Guillaume 22b220bc77 protobuf: Add licensing info and update copyright
Signed-off-by: Guillaume Déflache <guillaume.deflache@ibwag.com>
2015-05-21 14:41:11 +02:00
Martijn Zilverschoon 91f8f8b097 protobuf: Fixed protobuf host installation
Fixed the host install, because some packages need the host binary to build properly

Signed-off-by: Martijn Zilverschoon <martijn@friedzombie.com>
2014-11-24 05:30:32 +01:00
Etienne CHAMPETIER 92fc1687c1 protobuf: make it compile with __MIPSEB__ (ar71xx)
it's only compile tested

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
2014-07-01 18:36:53 +02:00
Jacob Siverskog 3843347ba6 protobuf: import from packages, bump version, fix build errors.
Signed-off-by: Jacob Siverskog <jacob@teenageengineering.com>
2014-06-16 10:22:52 +02:00