Author: aurel32
Date: 2014-07-10 21:12:23 +0000 (Thu, 10 Jul 2014)
New Revision: 6206

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:
debian/control.in/main, debian/sysdeps/linux.mk: drop systemtap support.
sdt.h has been moved to a different location in the latest upload, and
it's not really clear on which architectures systemtap support should
be enabled.

Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2014-07-10 20:58:25 UTC (rev 
6205)
+++ glibc-package/trunk/debian/changelog        2014-07-10 21:12:23 UTC (rev 
6206)
@@ -5,6 +5,10 @@
     locale environment handling (CVE-2014-0475).
   * debian/patches/any/cvs-setlocale-alloca.diff: Additional setlocale
     hardening.
+  * debian/control.in/main, debian/sysdeps/linux.mk: drop systemtap support.
+    sdt.h has been moved to a different location in the latest upload, and
+    it's not really clear on which architectures systemtap support should
+    be enabled.
 
   [ Helmut Grohne ]
   * debian/rules.d/debhelper.mk: fix dh_strip call in stage1.  Closes: 

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control  2014-07-10 20:58:25 UTC (rev 6205)
+++ glibc-package/trunk/debian/control  2014-07-10 21:12:23 UTC (rev 6206)
@@ -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], 
systemtap-sdt-dev [linux-any],
+ libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-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-07-10 20:58:25 UTC (rev 
6205)
+++ glibc-package/trunk/debian/control.in/main  2014-07-10 21:12:23 UTC (rev 
6206)
@@ -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], 
systemtap-sdt-dev [linux-any],
+ libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-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-07-10 20:58:25 UTC (rev 
6205)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2014-07-10 21:12:23 UTC (rev 
6206)
@@ -12,7 +12,7 @@
 ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
   libc_extra_config_options = $(extra_config_options)
 else
-  libc_extra_config_options = --with-selinux --enable-systemtap 
$(extra_config_options)
+  libc_extra_config_options = --with-selinux $(extra_config_options)
 endif
 
 ifndef LINUX_SOURCE
@@ -44,7 +44,7 @@
        ln -s $(LINUX_HEADERS)/linux debian/include
 
        # Library headers
-       for h in libaudit.h selinux sys/capability.h sys/sdt.h ; do \
+       for h in libaudit.h selinux sys/capability.h ; do \
            mkdir -p debian/include/$$(dirname $$h) ; \
            if [ -d "/usr/include/$(DEB_HOST_MULTIARCH)/$$h" ]; then \
                ln -s /usr/include/$(DEB_HOST_MULTIARCH)/$$h debian/include/$$h 
; \


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]

Reply via email to