Message ID | 20170411222643.9770-1-romain.naour@gmail.com |
---|---|
State | Accepted |
Headers | show |
Hello,
On Wed, 12 Apr 2017 00:26:30 +0200, Romain Naour wrote:
> + ln -sf libhiredis.so $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR)
I don't think this was the correct fix, the symbolic link should be the
other way around, and indeed the "make install" of hiredis does it the
other way around.
So I've tweaked your patch to instead install the library itself as
libhiredis.so.0.13, and create a symbolic link named libhiredis.so.
Thanks!
Thomas
Hi Bernd, Thank for the review, it's very appreciated :) Le 11/06/2017 à 18:54, Bernd Kuhls a écrit : > Hi Romain, > > afaics the irrlicht package only provides libirrlicht.so. > What about naming the package libirrlicht and move it to > "Target packages > Libraries > Graphics"? Make sense even if irrlicht is the upstream name. In the past, I hesitated to do so for efl package which can be named libefl. > > Am Wed, 12 Apr 2017 00:26:31 +0200 schrieb Romain Naour: > >> Signed-off-by: Romain Naour <romain.naour-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> >> --- >> DEVELOPERS | 1 + >> package/Config.in | 1 + >> ...-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch | 44 +++++++++++++++++ >> package/irrlicht/0002-remove-sys-sysctl.h.patch | 38 +++++++++++++++ > > Did you send the patches upstream? Not yet. I'll do it. > > @Whoever will commit the patches to buildroot: The irrlicht source code > has DOS line endings, please adjust the patch files accordingly. Indeed, thanks for the warning. > >> diff --git a/package/irrlicht/irrlicht.mk b/package/irrlicht/irrlicht.mk >> new file mode 100644 >> index 0000000..ab6187c >> --- /dev/null >> +++ b/package/irrlicht/irrlicht.mk >> @@ -0,0 +1,57 @@ >> +################################################################################ >> +# >> +# irrlicht >> +# >> +################################################################################ >> + >> +IRRLICHT_VERSION_MAJOR = 1.8 >> +IRRLICHT_VERSION = $(IRRLICHT_VERSION_MAJOR).4 >> +IRRLICHT_SOURCE = irrlicht-$(IRRLICHT_VERSION).zip >> +IRRLICHT_SITE = https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/$(IRRLICHT_VERSION_MAJOR)/$(IRRLICHT_VERSION) >> +IRRLICHT_INSTALL_STAGING = YES >> + >> +# Bundled libraries: bzip2, libaesGladman, libpng, lzma, zlib, >> +IRRLICHT_LICENSE = bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng, Zlib > > Please mention the license of the irrlicht package itself. Irrlicht itself use Zlib license. http://pkgs.fedoraproject.org/cgit/rpms/irrlicht.git/tree/irrlicht.spec#n9 Best regards, Romain > > Regards, Bernd >
On 11-06-17 23:09, Romain Naour wrote: > Hi Bernd, > > Thank for the review, it's very appreciated :) > > Le 11/06/2017 à 18:54, Bernd Kuhls a écrit : >> Hi Romain, >> >> afaics the irrlicht package only provides libirrlicht.so. >> What about naming the package libirrlicht and move it to >> "Target packages > Libraries > Graphics"? > > Make sense even if irrlicht is the upstream name. > In the past, I hesitated to do so for efl package which can be named libefl. No, in Buildroot, we always use the upstream name (except for python-* etc.). [snip] >>> +# Bundled libraries: bzip2, libaesGladman, libpng, lzma, zlib, >>> +IRRLICHT_LICENSE = bzip2 license, jpeg-license (BSD-3-Clause-like), Libpng, Zlib >> >> Please mention the license of the irrlicht package itself. > > Irrlicht itself use Zlib license. Then Zlib license should be first, and the license of the bundled libraries should mention which bit they apply to between brackets. By the way, could you mention in the commit message why unbundling is not possible? Regards, Arnout > > http://pkgs.fedoraproject.org/cgit/rpms/irrlicht.git/tree/irrlicht.spec#n9 > > Best regards, > Romain > >> >> Regards, Bernd >> > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot >
Am Sun, 11 Jun 2017 23:33:27 +0200 schrieb Arnout Vandecappelle: > On 11-06-17 23:09, Romain Naour wrote: >> Hi Bernd, >> >> Thank for the review, it's very appreciated :) >> >> Le 11/06/2017 à 18:54, Bernd Kuhls a écrit : >>> Hi Romain, >>> >>> afaics the irrlicht package only provides libirrlicht.so. >>> What about naming the package libirrlicht and move it to >>> "Target packages > Libraries > Graphics"? >> >> Make sense even if irrlicht is the upstream name. >> In the past, I hesitated to do so for efl package which can be named libefl. > > No, in Buildroot, we always use the upstream name (except for python-* etc.). Hi Arnout, this is not true for example for libcurl, libfribidi, libglew, libglfw and libspandsp whose respective upstream project names also lack "lib". Regards, Bernd
diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index 53ad0b9..6472934 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,7 +4,8 @@ # ################################################################################ -HIREDIS_VERSION = v0.13.3 +HIREDIS_VERSION_MAJOR = 0.13 +HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).3 HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING @@ -37,12 +38,14 @@ define HIREDIS_INSTALL_STAGING_CMDS $(@D)/adapters $(HIREDIS_INCLUDE_DIR) $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc + ln -sf libhiredis.so $(STAGING_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) $(INSTALL) -m 0644 -t $(STAGING_DIR)/usr/lib $(@D)/libhiredis* endef define HIREDIS_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib $(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/lib $(@D)/libhiredis* + ln -sf libhiredis.so $(TARGET_DIR)/usr/lib/libhiredis.so.$(HIREDIS_VERSION_MAJOR) endef $(eval $(generic-package))
While testing minetest with libhiredis library, the game crached due to missing libhiredis.so.0.13 library. Since the build system doesn't use "make install" and install manually headers and library file, it must also create the symlink libhiredis.so.0.13 -> libhiredis.so Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/hiredis/hiredis.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)