Changeset 7380

Timestamp:

02/17/11 05:58:54 (2 years ago)

Author:

alanbach-guest

Message:

• Added libv8 to Vinnie security

Location:

pkg/security/vinnie/main/libv8/trunk/debian

Files:

• README.source (modified) (2 diffs)
• changelog (modified) (1 diff)
• control (modified) (4 diffs)
• gbp.conf (added)
• libv8-2.5.9.15.install (added)
• libv8-2.5.9.9.install (deleted)
• patches/0001-enable_soname.patch (modified) (2 diffs)
• patches/0002-armel-build.patch (modified) (1 diff)
• patches/0003-add-the-install-target.patch (added)
• patches/0003-platform-detection-x86_64-and-mips.patch (deleted)
• patches/0004-add-the-install-target.patch (deleted)
• patches/series (modified) (1 diff)
• rules (modified) (3 diffs)

pkg/security/vinnie/main/libv8/trunk/debian/README.source

@@ -1 @@
-Patches management
-=====
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.  Please see:
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
-
-
 Import a new version using git-buildpackage layout:
 =====
@@ -41 +30 @@
 4) edit debian/control and remove any reference to the old version by updating
 it with the new version
-
-
-ARMEL and VFP
-=============
-
-v8 detects at runtime the available processor features, like vfp.
-Unfortunately, in libv8 2.4.9.9 it assumes "vfp" feature is "vfp3", see :
-http://code.google.com/p/v8/issues/detail?id=914
-This bug appears when running v8 on some arm variants (qemu arm being one of them),
-and has been fixed in version 2.5.4

pkg/security/vinnie/main/libv8/trunk/debian/changelog

@@ +1 @@
+libv8 (2.5.9.15-2) unstable; urgency=low
+
+  * Builds with snapshot=on. (Closes: #612781) 
+
+ -- Jérémy Lal <kapouer@melix.org>  Sat, 12 Feb 2011 02:27:40 +0100
+
+libv8 (2.5.9.15-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ Jérémy Lal ]
+  * Map DEB_HOST_ARCH and DEB_HOST_ARCH_OS to v8 scons options 'arch'
+    and 'os'. (Closes: #611215)
+    Move to team-maintainance, with me as maintainer and Jonas
+    Smedegaard as uploader.
+    Drop Antonio Radici as uploader: Thanks for your contributions,
+    Antonio!
+
+  [ Jonas Smedegaard ]
+  * Tidy CDBS variables internally in rules file.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 07 Feb 2011 01:36:39 +0100
+
 libv8 (2.5.9.9-2) unstable; urgency=low
 

pkg/security/vinnie/main/libv8/trunk/debian/control

@@ -1 +1 @@
 Source: libv8
 Priority: optional
-Maintainer: Antonio Radici <antonio@dyne.org>
-Uploaders: Jérémy Lal <kapouer@melix.org>
+Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
+Uploaders: Jérémy Lal <kapouer@melix.org>,
+ Jonas Smedegaard <dr@jones.dk>
 Build-Depends: debhelper (>= 7), pkg-config, scons, cdbs (>= 0.4.73)
 Standards-Version: 3.9.1
@@ -14 +15 @@
 Section: libdevel
 Architecture: i386 amd64 armel
-Depends: libv8-2.5.9.9 (= ${binary:Version}), ${misc:Depends}
+Depends: libv8-2.5.9.15 (= ${binary:Version}), ${misc:Depends}
 Description: Development files for the V8 JavaScript Engine
  V8 is Google's open source, high performance JavaScript engine. It is written
@@ -22 +23 @@
  V8 JavaScript Engine
 
-Package: libv8-2.5.9.9
+Package: libv8-2.5.9.15
 Architecture: i386 amd64 armel
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -36 +37 @@
 Section: debug
 Architecture: i386 amd64 armel
-Depends: libv8-2.5.9.9 (= ${binary:Version}), ${misc:Depends}
+Depends: libv8-2.5.9.15 (= ${binary:Version}), ${misc:Depends}
 Description: Debugging symbols for the V8 JavaScript Engine
  V8 is Google's open source, high performance JavaScript engine. It is written

pkg/security/vinnie/main/libv8/trunk/debian/patches/0001-enable_soname.patch

@@ -1 @@
-patch to enable the soname that is not automatically shipped with SConstruct
-
+Description: scons soname=on needs soname to be set
+Forwarded: not-needed
+Author: Antonio Radici <antonio@dyne.org>
+Last-Update: 2011-01-24
 --- a/src/version.cc
 +++ b/src/version.cc
@@ -8 +10 @@
  // number. This define is mainly used by the SCons build script.
 -#define SONAME            ""
-+#define SONAME            "libv8.so.2.5.9.9"
++#define SONAME            "libv8.so.2.5.9.15"
  
  namespace v8 {

pkg/security/vinnie/main/libv8/trunk/debian/patches/0002-armel-build.patch

@@ -1 @@
-Tune flags to build libv8 on armel
- * mno-thumb-interwork to allow compilation on default debian armel target (-march=armv4t), see http://code.google.com/p/v8/issues/detail?id=590. Actually simply removing the warning seems to be fine now.
- * fno-tree-sink to workaround a gcc armel bug, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39604
- * Wno-psabi to fix gcc warnings on armel, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42748
-
+Description: tune flags to build libv8 on armel
+ * mno-thumb-interwork to allow compilation on default debian armel target (-march=armv4t)
+ * fno-tree-sink to workaround a gcc armel bug
+ * Wno-psabi to fix gcc warnings on armel
+Forwarded: not-needed
+Author: Antonio Radici <antonio@dyne.org>
+Author: Jérémy Lal <kapouer@melix.org>
+Bug-V8: http://code.google.com/p/v8/issues/detail?id=590
+Bug-GCC: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39604
+Bug-GCC: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42748
+Last-Update: 2010-11-25
 --- a/SConstruct
 +++ b/SConstruct

pkg/security/vinnie/main/libv8/trunk/debian/patches/series

@@ -1 +1 @@
 0001-enable_soname.patch
 0002-armel-build.patch
-0003-platform-detection-x86_64-and-mips.patch
-0004-add-the-install-target.patch
+0003-add-the-install-target.patch

pkg/security/vinnie/main/libv8/trunk/debian/rules

@@ -4 +4 @@
 include /usr/share/cdbs/1/class/scons.mk
 
-SONAME                  := 2.5.9.9
+SONAME = 2.5.9.15
 
-DEB_DH_MAKESHLIBS_ARGS := -- -c4
+DEB_DH_MAKESHLIBS_ARGS = -- -c4
 
 CXXFLAGS += -fno-strict-aliasing
@@ -13 +13 @@
 export CXXFLAGS
 
-DEB_SCONS_OPTIONS          := library=shared soname=on shlibtype=hidden
-DEB_SCONS_BUILD_TARGET     := library
-# policy 4.9.1
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-        DEB_SCONS_BUILD_OPTIONS    := sample=shell
-        DEB_SCONS_BUILD_TARGET     += sample cctests
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        DEB_SCONS_BUILD_OPTIONS += -j$(NUMJOBS)
-endif
-DEB_SCONS_INSTALL_OPTIONS  := $(DEB_SCONS_OPTIONS) DESTDIR=$(DEB_DESTDIR)
+# map HOST ARCH AND OS to v8 options
+v8arch := $(or $(v8arch),$(if $(filter i386,$(DEB_HOST_ARCH)),ia32))
+v8arch := $(or $(v8arch),$(if $(filter amd64,$(DEB_HOST_ARCH)),x64))
+v8arch := $(or $(v8arch),$(if $(filter armel,$(DEB_HOST_ARCH)),arm))
+v8arch := $(or $(v8arch),$(if $(filter armhf,$(DEB_HOST_ARCH)),arm))
+v8arch := $(or $(v8arch),$(if $(filter mipsel,$(DEB_HOST_ARCH)),mips))
+v8arch := $(or $(v8arch),$(DEB_HOST_ARCH))
+v8os := $(or $(v8os),$(if $(filter linux,$(DEB_HOST_ARCH_OS)),linux))
+v8os := $(or $(v8os),$(if $(filter kfreebsd,$(DEB_HOST_ARCH_OS)),freebsd))
+v8os := $(or $(v8os),$(DEB_HOST_ARCH_OS))
+
+DEB_SCONS_OPTIONS = library=shared soname=on snapshot=on shlibtype=hidden arch=$(v8arch) os=$(v8os)
+DEB_SCONS_BUILD_TARGET = library
+
+# regression tests need to build shell for mjsunit, and cc code for cctest
+DEB_SCONS_CHECK_TARGET = sample sample=shell cctests
+
+DEB_SCONS_INSTALL_OPTIONS += DESTDIR="$(cdbs_curdestdir)"
 
 clean::
@@ -32 +38 @@
         rm -f shell
 
+# actually run regression tests
 common-post-build-impl::
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-        LD_PRELOAD=$(CURDIR)/libv8-$(SONAME).so $(CURDIR)/tools/test.py --no-build cctest mjsunit message
-endif
+        $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,LD_PRELOAD=$(CURDIR)/libv8-$(SONAME).so $(CURDIR)/tools/test.py --snapshot --no-build cctest mjsunit message arch=$(v8arch))
 
 common-install-impl::