Hi, > -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] > On Behalf Of Ye Holmes > Sent: Dienstag, 9. Februar 2021 04:20 > To: m...@adrianschmutzler.de; ros...@gmail.com > Cc: openwrt-devel@lists.openwrt.org > Subject: Re: [PATCH v2] openpgm: Add Pragmatic General Multicast library > > openpgm: Add Pragmatic General Multicast library
Your "v2" still lacks a commit message, explaining what you do and _why_. Note that the primary way to submit to the packages repository is via GitHub PRs: https://github.com/openwrt/packages/pulls This comes with certain helpers like build tests etc. Further help may be found here: https://github.com/openwrt/packages/blob/master/CONTRIBUTING.md Best Adrian > > Signed-off-by: Ye Holmes <yehol...@outlook.com> > --- > Sorry for the late reply; I found the messages in the "Junk" > section from my thunderbird email client, my bad, :) > > On Sun, 7 Feb 2021 21:31:45 +0000, Paul Spooren wrote: > > Can't this package go to packages.git? > > Yes, I indeed wanted to push the package into packages.git, but I didn't and > don't know how to push it, I can't find related information from official > website, sorry again... > > On Sonntag, 3. Januar 2021 12:43, Adrian wrote: > > this lacks a commit message. > > Sorry, again! > --- > libs/openpgm/Makefile | 64 +++++++++++++++++++ > .../0001-Rename-openpgm-5.2.pc.in.patch | 22 +++++++ > ...hecksum.c-fix-build-with-32-bits-MMX.patch | 38 +++++++++++ > 3 files changed, 124 insertions(+) > create mode 100644 libs/openpgm/Makefile create mode 100644 > libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch > create mode 100644 libs/openpgm/patches/0002-openpgm-pgm- > checksum.c-fix-build-with-32-bits-MMX.patch > > diff --git a/libs/openpgm/Makefile b/libs/openpgm/Makefile new file mode > 100644 index 000000000..15a03e926 > --- /dev/null > +++ b/libs/openpgm/Makefile > @@ -0,0 +1,64 @@ > +# > +# Copyright (C) 2021 OpenWrt.org > +# > +# This is free software, licensed under the GNU General Public License v2. > +# See /LICENSE for more information. > +# > +# This Makefile for OpenPGM > +# > + > +include $(TOPDIR)/rules.mk > + > +PKG_NAME:=openpgm > +PKG_VERSION:=5.3.128 > +PKG_RELEASE:=1 > + > +PKG_SOURCE:=release-5-3-128.tar.gz > +PKG_SOURCE_URL:=https://github.com/steve-o/openpgm/archive > +PKG_HASH:=8d707ef8dda45f4a7bc91016d7f2fed6a418637185d76c7ab30b30 > 6499c6d > +393 > + > +PKG_MAINTAINER:=Ye Holmes <yehol...@outlook.com> > +PKG_LICENSE:=LGPL-2.1-or-later > PKG_LICENSE_FILES:=openpgm/pgm/LICENSE > +PKG_CPE_ID:=cpe:/a:openpgm:openpgm > + > +PKG_FIXUP:=autoreconf > +PKG_BUILD_DIR:=$(BUILD_DIR)/openpgm-release-5-3-128 > +include $(INCLUDE_DIR)/package.mk > + > +define Package/openpgm > + TITLE:=OpenPGM, an implementation of the PGM protocol > + URL:=http://openpgm.googlecode.com/ > + SECTION:=libs > + CATEGORY:=Libraries > +endef > + > +define Package/openpgm/description > + OpenPGM is a library implementing the PGM reliable multicast > + network protocol. For more information about OpenPGM, see: > + http://openpgm.googlecode.com/ > +endef > + > +CONFIGURE_VARS += ac_cv_file__proc_cpuinfo=yes \ > + ac_cv_file__dev_rtc=no ac_cv_file__dev_hpet=no CONFIGURE_ARGS += > +--enable-static=no --enable-shared=yes > + > +define Build/Prepare > + $(call Build/Prepare/Default) > + mv $(PKG_BUILD_DIR)/openpgm/pgm/* $(PKG_BUILD_DIR)/ endef > + > +define Build/InstallDev > + $(INSTALL_DIR) $(1)/usr/include/pgm > + $(CP) $(PKG_BUILD_DIR)/include/pgm/* $(1)/usr/include/pgm/ > + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig > + $(CP) $(PKG_BUILD_DIR)/.libs/libpgm*.so* $(1)/usr/lib/ > + $(CP) $(PKG_BUILD_DIR)/openpgm-5.3.pc $(1)/usr/lib/pkgconfig/ > endef > + > +define Package/openpgm/install > + $(INSTALL_DIR) $(1)/usr/lib > + $(CP) $(PKG_BUILD_DIR)/.libs/libpgm*.so* $(1)/usr/lib/ endef > + > +$(eval $(call BuildPackage,openpgm)) > diff --git a/libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch > b/libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch > new file mode 100644 > index 000000000..a51a026f9 > --- /dev/null > +++ b/libs/openpgm/patches/0001-Rename-openpgm-5.2.pc.in.patch > @@ -0,0 +1,22 @@ > +From 240634b1afb968a051f8c68696eae2a582a02450 Mon Sep 17 00:00:00 > 2001 > +From: Fabrice Fontaine <fontaine.fabr...@gmail.com> > +Date: Mon, 31 Aug 2020 20:16:25 +0200 > +Subject: [PATCH 1/2] Rename openpgm-5.2.pc.in > + > +This will fix the following build failure: > + > +config.status: error: cannot find input file: `openpgm-5.3.pc.in' > + > +Signed-off-by: Fabrice Fontaine <fontaine.fabr...@gmail.com> > +--- > + openpgm/pgm/{openpgm-5.2.pc.in => openpgm-5.3.pc.in} | 0 > + 1 file changed, 0 insertions(+), 0 deletions(-) rename > +openpgm/pgm/{openpgm-5.2.pc.in => openpgm-5.3.pc.in} (100%) > + > +diff --git a/openpgm/pgm/openpgm-5.2.pc.in > +b/openpgm/pgm/openpgm-5.3.pc.in similarity index 100% rename from > +openpgm/pgm/openpgm-5.2.pc.in rename to openpgm/pgm/openpgm- > 5.3.pc.in > +-- > +2.25.1 > + > diff --git a/libs/openpgm/patches/0002-openpgm-pgm-checksum.c-fix-build- > with-32-bits-MMX.patch b/libs/openpgm/patches/0002-openpgm-pgm- > checksum.c-fix-build-with-32-bits-MMX.patch > new file mode 100644 > index 000000000..2012021c0 > --- /dev/null > +++ b/libs/openpgm/patches/0002-openpgm-pgm-checksum.c-fix-build- > with-32 > +++ -bits-MMX.patch > @@ -0,0 +1,38 @@ > +From b7fa865fa6b06d97d424c500fd1c4bc44c096359 Mon Sep 17 00:00:00 > 2001 > +From: Fabrice Fontaine <fontaine.fabr...@gmail.com> > +Date: Sun, 1 Nov 2020 22:46:18 +0100 > +Subject: [PATCH 2/2] openpgm/pgm/checksum.c: fix build with 32 bits > MMX > + > +Build with i386-pentium-mmx or i686 is broken since version 5-3-128 and > +https://github.com/steve- > o/openpgm/commit/b276dc15be5d4e6e1143b9de25d09 > +f63f9c85135 because _mm_cvtm64_si64 is undefined resulting in the > +following build failure for example on zeromq: > + > +/srv/storage/autobuild/run/instance-3/output-1/host/opt/ext- > toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/8.3.0/../../../../i586- > buildroot-linux-musl/bin/ld: /srv/storage/autobuild/run/instance-3/output- > 1/host/i586-buildroot-linux-musl/sysroot/usr/lib32/libpgm-5.3.so.0: > undefined reference to `_mm_cvtm64_si64' > + > +So use the fallback if __x86_64__ is not defined > + > +Fixes: > + - > +http://autobuild.buildroot.org/results/01d9be37e8a743307128f53f41785654 > +c9971e1a > + > +Signed-off-by: Fabrice Fontaine <fontaine.fabr...@gmail.com> > +--- > + openpgm/pgm/checksum.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/openpgm/pgm/checksum.c b/openpgm/pgm/checksum.c index > +fef89bc..8d8dd3f 100644 > +--- a/openpgm/pgm/checksum.c > ++++ b/openpgm/pgm/checksum.c > +@@ -948,7 +948,7 @@ do_csumcpy_mmx ( > + > + sum = _mm_add_pi32 (sum, lo); > + sum = _mm_add_pi32 (sum, hi); > +-#if 1 > ++#if defined(__x86_64__) > + *(int64_t*)dst = _mm_cvtm64_si64 (tmp); > + #else > + ((int*)dst)[1] = _mm_cvtsi64_si32 (tmp); > +-- > +2.25.1 > + > -- > 2.25.1 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
openpgp-digital-signature.asc
Description: PGP signature
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
