[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r6145 - in glibc-package/trunk/debian: . control.in sysdeps



Author: aurel32
Date: 2014-06-11 20:44:58 +0000 (Wed, 11 Jun 2014)
New Revision: 6145

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
   glibc-package/trunk/debian/sysdeps/linux.mk
Log:
Revert commit r6140, it has been fixed at the GCC level instead


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2014-06-11 20:41:53 UTC (rev 6144)
+++ glibc-package/trunk/debian/changelog	2014-06-11 20:44:58 UTC (rev 6145)
@@ -20,10 +20,6 @@
     - debian/sysdeps/mips64el.mk: new file.
     - debian/sysdeps/mipsn32.mk: new file.
     - debian/sysdeps/mipsn32el.mk: new file.
-  * debian/control.in/main, debian/sysdeps/linux.mk: disable systemtap support
-    as it causes issues on some architectures, it will be reenabled when it is
-    clear on which architectures it is actually supported.  Closes: #750996.
-    Reopen: #700760.
   * debian/control.in/libc: add a Breaks: check (<< 0.9.10-6.1+b1) on s390x,
     to make sure libcheck.a is using the GLIBC_2.19 version of the *jmp*
     functions.

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control	2014-06-11 20:41:53 UTC (rev 6144)
+++ glibc-package/trunk/debian/control	2014-06-11 20:44:58 UTC (rev 6145)
@@ -4,7 +4,7 @@
 Build-Depends: gettext, dpkg-dev (>= 1.16.0), xz-utils, file, quilt,
  autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks, netbase,
  linux-libc-dev (>= 3.9) [linux-any]
- libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
+ libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any], systemtap-sdt-dev [linux-any],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
  kfreebsd-kernel-headers [kfreebsd-any],
  binutils (>= 2.21),

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main	2014-06-11 20:41:53 UTC (rev 6144)
+++ glibc-package/trunk/debian/control.in/main	2014-06-11 20:44:58 UTC (rev 6145)
@@ -4,7 +4,7 @@
 Build-Depends: gettext, dpkg-dev (>= 1.16.0), xz-utils, file, quilt,
  autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks, netbase,
  linux-libc-dev (>= 3.9) [linux-any]
- libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
+ libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any], systemtap-sdt-dev [linux-any],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 1:0.5.git20140320~) [hurd-i386], gnumach-dev (>= 2:1.4-2~) [hurd-i386],
  kfreebsd-kernel-headers [kfreebsd-any],
  binutils (>= 2.21),

Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk	2014-06-11 20:41:53 UTC (rev 6144)
+++ glibc-package/trunk/debian/sysdeps/linux.mk	2014-06-11 20:44:58 UTC (rev 6145)
@@ -12,7 +12,7 @@
 ifeq ($(DEB_BUILD_PROFILE),bootstrap)
   libc_extra_config_options = $(extra_config_options)
 else
-  libc_extra_config_options = --with-selinux $(extra_config_options)
+  libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options)
 endif
 
 ifndef LINUX_SOURCE


Reply to: