Benoit Lecocq a écrit : > Stuart Henderson a écrit : >> On 2009/03/25 13:49, Benoit Lecocq wrote: >>> Stuart Henderson a écrit : >>>> On 2009/03/21 17:53, Benoit Lecocq wrote: >>>>> Hi, >>>>> >>>>> This is a diff for the latest version of libelf 0.8.10. >>>>> >>>>> Tested on amd64 and with dynamips who works fine. >>>>> Can take maintainership on it. >>>>> Comments ? OK ? Commit ? >> .. >> >> it seems this may cause some problems for the hobbits-and-gnomes >> department, it breaks bug-buddy. >> > > OK, I will take a look at this.
Better with this new diff. I can compile bug-buddy and dynamips without problem. > >>> Index: Makefile >>> =================================================================== >>> RCS file: /cvs/ports/devel/libelf/Makefile,v >>> retrieving revision 1.3 >>> diff -u -r1.3 Makefile >>> --- Makefile 4 Jan 2008 17:48:34 -0000 1.3 >>> +++ Makefile 25 Mar 2009 12:48:17 -0000 >>> @@ -1,25 +1,25 @@ >>> # $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:34 espie Exp $ >>> >>> -COMMENT= read, modify, create ELF files on any arch >>> -CATEGORIES= devel >>> +COMMENT = read, modify, create ELF files on any arch >>> +DISTNAME = libelf-0.8.10 >>> +SHARED_LIBS = elf 1.0 >>> +CATEGORIES = devel >>> >>> +HOMEPAGE = http://www.mr511.de/software/english.html >>> >>> -# The actual homepage is in german, this points to it. >>> -HOMEPAGE= http://directory.fsf.org/all/libelf.html >>> -MASTER_SITES= http://www.mr511.de/software/ >>> -DISTNAME= libelf-0.8.6 >>> -SHARED_LIBS= elf 0.0 >>> +# LGPL >>> +PERMIT_DISTFILES_FTP = Yes >>> +PERMIT_DISTFILES_CDROM = Yes >>> +PERMIT_PACKAGE_FTP = Yes >>> +PERMIT_PACKAGE_CDROM = Yes >>> >>> -CONFIGURE_STYLE= autoconf >>> -AUTOCONF_VERSION= 2.13 >>> -CONFIGURE_ARGS= --disable-nls >>> -MAKE_FLAGS= SHLIB_SFX=.so.$(LIBelf_VERSION) >>> -DESTDIRNAME= instroot >>> +MASTER_SITES = http://www.mr511.de/software/ \ >>> + ftp://ftp.ibiblio.org/pub/Linux/libs/ >>> >>> -# LGPL >>> -PERMIT_DISTFILES_FTP= Yes >>> -PERMIT_DISTFILES_CDROM= Yes >>> -PERMIT_PACKAGE_FTP= Yes >>> -PERMIT_PACKAGE_CDROM= Yes >>> +MAKE_FLAGS = SHLIB_SFX=.so.$(LIBelf_VERSION) \ >>> + instroot=${DESTDIR} >>> +CONFIGURE_STYLE = autoconf >>> +CONFIGURE_ARGS = --disable-nls --disable-compat >>> +AUTOCONF_VERSION = 2.13 >>> >>> .include <bsd.port.mk> >>> Index: distinfo >>> =================================================================== >>> RCS file: /cvs/ports/devel/libelf/distinfo,v >>> retrieving revision 1.2 >>> diff -u -r1.2 distinfo >>> --- distinfo 5 Apr 2007 15:37:55 -0000 1.2 >>> +++ distinfo 25 Mar 2009 12:48:17 -0000 >>> @@ -1,5 +1,5 @@ >>> -MD5 (libelf-0.8.6.tar.gz) = 1ET7AGjN/tAbsf0ekdKScA== >>> -RMD160 (libelf-0.8.6.tar.gz) = +PrdedJ/CD05wxpbOnJlXUwIQtI= >>> -SHA1 (libelf-0.8.6.tar.gz) = HoZaMx83zEe16pblBEntk0Quy/A= >>> -SHA256 (libelf-0.8.6.tar.gz) = b/el27XM8UmV9r3n8fymvl9/kfYrJoCgDTLoKxcslJk= >>> -SIZE (libelf-0.8.6.tar.gz) = 144198 >>> +MD5 (libelf-0.8.10.tar.gz) = nbTTbCg9l5DY+n3x9Ne02Q== >>> +RMD160 (libelf-0.8.10.tar.gz) = CXs8GPNCM72UhPLsU8ZahLIiLzE= >>> +SHA1 (libelf-0.8.10.tar.gz) = X2+2ZrDPYEJDEQODulXvN98cjs4= >>> +SHA256 (libelf-0.8.10.tar.gz) = >>> LXmVSFwPj0vu+Y2MG3lwse+zQZPBp2TZHyhiTYMwKgk= >>> +SIZE (libelf-0.8.10.tar.gz) = 147824 >>> Index: patches/patch-aclocal_m4 >>> =================================================================== >>> RCS file: /cvs/ports/devel/libelf/patches/patch-aclocal_m4,v >>> retrieving revision 1.1.1.1 >>> diff -u -r1.1.1.1 patch-aclocal_m4 >>> --- patches/patch-aclocal_m4 12 Jul 2006 08:45:58 -0000 1.1.1.1 >>> +++ patches/patch-aclocal_m4 25 Mar 2009 12:48:17 -0000 >>> @@ -1,7 +1,7 @@ >>> $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2006/07/12 08:45:58 espie Exp $ >>> ---- aclocal.m4.orig Sat May 21 17:39:19 2005 >>> -+++ aclocal.m4 Wed Jul 12 10:39:55 2006 >>> -@@ -269,6 +269,14 @@ AC_DEFUN(mr_ENABLE_SHARED, [ >>> +--- aclocal.m4.orig Fri Sep 7 14:07:59 2007 >>> ++++ aclocal.m4 Wed Mar 25 13:47:12 2009 >>> +@@ -288,6 +288,14 @@ AC_DEFUN(mr_ENABLE_SHARED, [ >>> mr_enable_shared=no >>> fi >>> ;; >>> Index: pkg/PLIST >>> =================================================================== >>> RCS file: /cvs/ports/devel/libelf/pkg/PLIST,v >>> retrieving revision 1.1.1.1 >>> diff -u -r1.1.1.1 PLIST >>> --- pkg/PLIST 12 Jul 2006 08:45:58 -0000 1.1.1.1 >>> +++ pkg/PLIST 25 Mar 2009 12:48:17 -0000 >>> @@ -1,14 +1,11 @@ >>> @comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/12 08:45:58 espie Exp $ >>> %%SHARED%% >>> -include/gelf.h >>> include/libelf/ >>> -include/libelf.h >>> include/libelf/elf_repl.h >>> include/libelf/gelf.h >>> include/libelf/libelf.h >>> include/libelf/nlist.h >>> include/libelf/sys_elf.h >>> -include/nlist.h >>> lib/libelf.a >>> lib/pkgconfig/ >>> lib/pkgconfig/libelf.pc >> > >
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/libelf/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 4 Jan 2008 17:48:34 -0000 1.3 +++ Makefile 16 Apr 2009 13:40:45 -0000 @@ -1,25 +1,29 @@ # $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:34 espie Exp $ -COMMENT= read, modify, create ELF files on any arch -CATEGORIES= devel +COMMENT = read, modify, create ELF files on any arch +DISTNAME = libelf-0.8.10 +SHARED_LIBS = elf 1.0 +CATEGORIES = devel +HOMEPAGE = http://www.mr511.de/software/english.html -# The actual homepage is in german, this points to it. -HOMEPAGE= http://directory.fsf.org/all/libelf.html -MASTER_SITES= http://www.mr511.de/software/ -DISTNAME= libelf-0.8.6 -SHARED_LIBS= elf 0.0 +# LGPL +PERMIT_DISTFILES_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_PACKAGE_CDROM = Yes -CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.13 -CONFIGURE_ARGS= --disable-nls -MAKE_FLAGS= SHLIB_SFX=.so.$(LIBelf_VERSION) -DESTDIRNAME= instroot +MASTER_SITES = http://www.mr511.de/software/ \ + ftp://ftp.ibiblio.org/pub/Linux/libs/ -# LGPL -PERMIT_DISTFILES_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_PACKAGE_CDROM= Yes +MAKE_FLAGS = SHLIB_SFX=.so.$(LIBelf_VERSION) \ + instroot=${DESTDIR} +CONFIGURE_STYLE = autoconf +CONFIGURE_ARGS = --disable-nls --disable-compat +AUTOCONF_VERSION = 2.13 +post-install: + ln -sf ${TRUEPREFIX}/include/libelf/libelf.h ${PREFIX}/include/libelf.h + ln -sf ${TRUEPREFIX}/include/libelf/gelf.h ${PREFIX}/include/gelf.h + .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/libelf/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 5 Apr 2007 15:37:55 -0000 1.2 +++ distinfo 16 Apr 2009 13:40:45 -0000 @@ -1,5 +1,5 @@ -MD5 (libelf-0.8.6.tar.gz) = 1ET7AGjN/tAbsf0ekdKScA== -RMD160 (libelf-0.8.6.tar.gz) = +PrdedJ/CD05wxpbOnJlXUwIQtI= -SHA1 (libelf-0.8.6.tar.gz) = HoZaMx83zEe16pblBEntk0Quy/A= -SHA256 (libelf-0.8.6.tar.gz) = b/el27XM8UmV9r3n8fymvl9/kfYrJoCgDTLoKxcslJk= -SIZE (libelf-0.8.6.tar.gz) = 144198 +MD5 (libelf-0.8.10.tar.gz) = nbTTbCg9l5DY+n3x9Ne02Q== +RMD160 (libelf-0.8.10.tar.gz) = CXs8GPNCM72UhPLsU8ZahLIiLzE= +SHA1 (libelf-0.8.10.tar.gz) = X2+2ZrDPYEJDEQODulXvN98cjs4= +SHA256 (libelf-0.8.10.tar.gz) = LXmVSFwPj0vu+Y2MG3lwse+zQZPBp2TZHyhiTYMwKgk= +SIZE (libelf-0.8.10.tar.gz) = 147824 Index: patches/patch-aclocal_m4 =================================================================== RCS file: /cvs/ports/devel/libelf/patches/patch-aclocal_m4,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-aclocal_m4 --- patches/patch-aclocal_m4 12 Jul 2006 08:45:58 -0000 1.1.1.1 +++ patches/patch-aclocal_m4 16 Apr 2009 13:40:45 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1.1.1 2006/07/12 08:45:58 espie Exp $ ---- aclocal.m4.orig Sat May 21 17:39:19 2005 -+++ aclocal.m4 Wed Jul 12 10:39:55 2006 -@@ -269,6 +269,14 @@ AC_DEFUN(mr_ENABLE_SHARED, [ +--- aclocal.m4.orig Fri Sep 7 14:07:59 2007 ++++ aclocal.m4 Wed Mar 25 13:47:12 2009 +@@ -288,6 +288,14 @@ AC_DEFUN(mr_ENABLE_SHARED, [ mr_enable_shared=no fi ;; Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/libelf/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pkg/PLIST 12 Jul 2006 08:45:58 -0000 1.1.1.1 +++ pkg/PLIST 16 Apr 2009 13:40:45 -0000 @@ -1,4 +1,4 @@ -...@comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/12 08:45:58 espie Exp $ +...@comment $OpenBSD$ %%SHARED%% include/gelf.h include/libelf/ @@ -8,7 +8,6 @@ include/libelf/libelf.h include/libelf/nlist.h include/libelf/sys_elf.h -include/nlist.h lib/libelf.a lib/pkgconfig/ lib/pkgconfig/libelf.pc
