[weasel-commit] Source: libelf-lgpl=0.8.4-1

From: rbuilder@xxxxxxxxx
To: weasel-commit@xxxxxxxxxxxxx
Date: Fri, 11 Jun 2010 14:03:07 -0400
================================
libelf-lgpl:source=0.8.4-1 (previous: 0.8.6-9)
cvc rdiff libelf-lgpl -1 /weasel.rpath.org@wgl:3-devel/0.8.4-1
================================
0.8.4-1 Filip Brcic (brcha@xxxxxxxxxxxx) Fri Jun 11 14:02:21 2010
    libelf-lgpl 0.8.4

libelf-0.8.4.tar.gz: new
libelf-lgpl.recipe: changed
Index: libelf-lgpl.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libelf-lgpl.recipe /weasel.rpath.org@wgl:3-devel/0.8.6-9
+++ libelf-lgpl.recipe /weasel.rpath.org@wgl:3-devel/0.8.4-1
@@ -1,60 +1,56 @@
 #
-# Copyright (c) 2007 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Weasel GNU/Linux [Filip Brcic (brcha@xxxxxxxxxxxx)]
+# Distributed under the terms of the GNU General Public License v3
 #
 
-# Note that this version of libelf has been modified as minimally
-# as possible not to have conflicting file paths with the elfutils
-# implementation of libelf, and it should work automatically with
-# anything that uses libelf.pc to find libelf.
+class LibelfLgpl(AutoPackageRecipe):
+    name = 'libelf-lgpl'
+    version = '0.8.4'
 
-class libelf(AutoPackageRecipe):
-    name = 'libelf-lgpl'
-    version = '0.8.6'
+    buildRequires = [
+        'gettext:runtime',
+        ]
 
-    if not Use.bootstrap:
-        buildRequires = [ 'gettext:runtime' ]
+    shortDesc  = 'A ELF object file access library'
+    url        = 'http://www.mr511.de/software/'
+    licenses   = [ 'LGPL-2' ]
+    categories = [ 'System' ]
 
     def unpack(r):
         r.macros.archive_name = 'libelf'
-        r.addArchive('http://www.mr511.de/software/')
-        r.disableParallelMake()
-
-        if Arch.x86_64:
-            macros32 = r.macros.copy()
-            macros32.cc = '"gcc -m32"'
-            macros32.cxx = '"g++ -m32"'
-            macros32.libdir = '%(prefix)s/lib'
-            r.Configure('--includedir=%(includedir)s/libelf-lgpl 
--enable-compat',
-                        objDir='build32', overrideMacros=macros32)
-            r.Replace(r'libelf\$', 'libelf-lgpl$', 'build32/lib/Makefile')
-            r.Replace(('-lelf', '-lelf-lgpl'),
-                      ('/libelf$', ''), 'build32/libelf.pc')
-            r.Make('AR=%(target)s-ar',
-                   dir='build32', overrideMacros=macros32)
-            r.MakeInstall(rootVar='instroot',
-                          dir='build32', overrideMacros=macros32)
-            r.Move('%(libdir)s/libelf.a', '%(libdir)s/libelf-lgpl.a',
-                   overrideMacros=macros32)
-
-            r.NormalizePkgConfig(exceptions='.*')
-            r.FixupMultilibPaths(exceptions='.*')
+        
r.addArchive('http://www.mr511.de/software/%(archive_name)s-%(version)s.tar.gz')
 
     def configure(r):
-        extraConfig = ''
-        if Use.bootstrap:
-            extraConfig = ' --disable-nls'
-        r.Configure('--includedir=%(includedir)s/libelf-lgpl --enable-compat' 
+ extraConfig)
-        r.Replace(r'libelf\$', 'libelf-lgpl$', 'lib/Makefile')
-        # Applications should include <gelf.h> and/or <libelf.h>
-        # which are not in the libelf subdirectory
-        r.Replace(('-lelf', '-lelf-lgpl'),
-                  ('/libelf$', ''), 'libelf.pc')
+        r.Configure(
+            ' --includedir=%(includedir)s/%(name)s'
+            ' --enable-nls'
+            ' --enable-shared'
+            ' --enable-compat'
+            )
 
-    def make(r):
-        r.Make('AR=%(target)s-ar')
+        # Fix libelf -> libelf-lgpl for compatibility with elfutils's libelf
+        r.Replace('includedir\)/libelf', 'includedir)',
+                  'lib/Makefile')
+        # r.Replace(('-lelf', '-lelf-lgpl'),
+        #           ('/libelf$', ''),
+        #           'libelf.pc')
 
     def makeinstall(r):
-        r.MakeInstall(rootVar='instroot')
-        r.Move('%(libdir)s/libelf.a', '%(libdir)s/libelf-lgpl.a')
+        r.Make(
+            ' prefix=%(destdir)s/%(prefix)s'
+            ' libdir=%(destdir)s/%(libdir)s'
+            ' includedir=%(destdir)s/%(includedir)s/%(name)s'
+            ' install'
+            ' install-compat'
+            )
+
+        r.Move('%(libdir)s/libelf.a',
+               '%(libdir)s/%(name)s.a')
+        r.Move('%(libdir)s/libelf.so.%(version)s',
+               '%(libdir)s/%(name)s.so.%(version)s')
+        r.Remove('%(libdir)s/libelf.*')
+        r.macros.major_ver = r.version.split('.')[0]
+        r.Symlink('%(libdir)s/%(name)s.so.%(version)s',
+                  '%(libdir)s/%(name)s.so.%(major_ver)s')
+        r.Symlink('%(libdir)s/%(name)s.so.%(version)s',
+                  '%(libdir)s/%(name)s.so')


libelf-0.8.6.tar.gz: removed

Committed by: brcha
[weasel-commit] Source: libelf-lgpl=0.8.4-1

Other related posts:
