From 4f1375b6517320160b5a731e638ba75dd45d0408 Mon Sep 17 00:00:00 2001 From: William Cohen Date: Mon, 25 Jun 2012 11:30:55 -0400 Subject: [PATCH] Import newer version of dyninst git repo. --- dyninst-notest.patch | 12 ---- dyninst-vers.patch | 148 ------------------------------------------- dyninst.spec | 11 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 167 deletions(-) delete mode 100644 dyninst-notest.patch delete mode 100644 dyninst-vers.patch diff --git a/dyninst-notest.patch b/dyninst-notest.patch deleted file mode 100644 index 01a8872..0000000 --- a/dyninst-notest.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up dyninst-8.0/dyninst/Makefile.notest dyninst-8.0/dyninst/Makefile ---- dyninst-8.0/dyninst/Makefile.notest 2012-06-12 16:43:01.409000013 -0400 -+++ dyninst-8.0/dyninst/Makefile 2012-06-12 16:43:20.417998282 -0400 -@@ -44,7 +44,7 @@ $(Everything_install) $(Everything_tests - $(Test_targets): - @$(MAKE) -C testsuite/$(PLATFORM) $(@:%_testsuite=%) - --install: intro ready $(fullSystem_install) testsuite_install -+install: intro ready $(fullSystem_install) - - world: intro $(fullSystem) - depend: diff --git a/dyninst-vers.patch b/dyninst-vers.patch deleted file mode 100644 index b587ae7..0000000 --- a/dyninst-vers.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/common/make.module.tmpl dyninst/common/make.module.tmpl -index bbb653f..1a5504d 100644 ---- a/common/make.module.tmpl -+++ dyninst/common/make.module.tmpl -@@ -42,7 +42,7 @@ endif - LDFLAGS += $(LIBDIR) - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared $(G_PTHREAD_LD) -+LDFLAGS += -shared $(G_PTHREAD_LD) -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += - CXXFLAGS += $(G_PTHREAD) - else -diff --git a/dynC_API/make.module.tmpl dyninst/dynC_API/make.module.tmpl -index 4877486..a016ece 100644 ---- a/dynC_API/make.module.tmpl -+++ dyninst/dynC_API/make.module.tmpl -@@ -22,7 +22,7 @@ LDFLAGS += -L../../common/$(PLATFORM) -L../../symtabAPI/$(PLATFORM) -L../../dyni - LDFLAGS += $(LIBDIR) - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared $(G_PTHREAD_LD) -+LDFLAGS += -shared $(G_PTHREAD_LD) -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += -fPIC - CXXFLAGS += -fPIC $(G_PTHREAD) - else -diff --git a/dyninstAPI/make.module.tmpl dyninst/dyninstAPI/make.module.tmpl -index fabb448..378fea7 100644 ---- a/dyninstAPI/make.module.tmpl -+++ dyninst/dyninstAPI/make.module.tmpl -@@ -54,7 +54,7 @@ LDFLAGS += -L../../stackwalk/$(PLATFORM) - - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared $(G_PTHREAD_LD) -+LDFLAGS += -shared $(G_PTHREAD_LD) -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += -fPIC - CXXFLAGS += -fPIC $(G_PTHREAD) - else -diff --git a/dyninstAPI_RT/i386-unknown-linux2.4/Makefile dyninst/dyninstAPI_RT/i386-unknown-linux2.4/Makefile -index aa39e22..4f4619a 100644 ---- a/dyninstAPI_RT/i386-unknown-linux2.4/Makefile -+++ dyninst/dyninstAPI_RT/i386-unknown-linux2.4/Makefile -@@ -18,7 +18,7 @@ endif - - # Now make any necessary architecture specific changes to variables: - LD = $(GCC) --LDFLAGS += -shared -+LDFLAGS += -shared -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += -O2 - - # if we want to produce a shared object... -diff --git a/dyninstAPI_RT/x86_64-unknown-linux2.4/Makefile dyninst/dyninstAPI_RT/x86_64-unknown-linux2.4/Makefile -index 3f72429..12eec29 100644 ---- a/dyninstAPI_RT/x86_64-unknown-linux2.4/Makefile -+++ dyninst/dyninstAPI_RT/x86_64-unknown-linux2.4/Makefile -@@ -17,7 +17,7 @@ endif - - # Now make any necessary architecture specific changes to variables: - LD = $(GCC) --LDFLAGS += -shared -+LDFLAGS += -shared -Wl,-soname,$(TARGET).$(RELEASE_NUM) - LDFLAGS += -m64 - CFLAGS += -Wall -m64 -DMUTATEE64 - -@@ -64,7 +64,7 @@ VOUCHER_32 = V_$(XTARGET_32) - OBJS_32 = $(patsubst %.c, %_m32.o, $(filter %.c,$(notdir $(SRCS)))) - ASM_OBJS_32 = $(patsubst %.S, %_m32.o, $(filter %.S,$(notdir $(ASM_SRCS_32)))) - CFLAGS_32 = $(subst -DMUTATEE64,-DMUTATEE_32,$(CFLAGS)) --LDFLAGS_32 = $(LDFLAGS) -+LDFLAGS_32 = $(subst $(TARGET),$(TARGET_32_SO),$(subst -m64,-m32,$(LDFLAGS))) - LIBS_32 = -L/usr/lib $(LIBS) - - -@@ -81,7 +81,7 @@ $(VOUCHER_32): - $(TARGET_32_SO): $(OBJS_32) $(ASM_OBJS_32) - $(HIDE_COMP)$(RM) $(TARGET_32_SO) - $(HIDE_COMP)$(MAKE) $(VOUCHER_32) -- $(HIDE_COMP)$(LD) $(subst -m64,-m32,$(LDFLAGS_32)) -o $(TARGET_32_SO) $(VOUCHER_32).o $(OBJS_32) $(ASM_OBJS_32) $(LIBS_32) -+ $(HIDE_COMP)$(LD) $(LDFLAGS_32) -o $(TARGET_32_SO) $(VOUCHER_32).o $(OBJS_32) $(ASM_OBJS_32) $(LIBS_32) - RTspace.o: ../src/RTspace.S - @echo "Compiling RTspace" - $(HIDE_COMP)$(CC) $(CFLAGS) -c $< -o $@ -diff --git a/instructionAPI/make.module.tmpl dyninst/instructionAPI/make.module.tmpl -index 34d4bdc..f8fe036 100644 ---- a/instructionAPI/make.module.tmpl -+++ dyninst/instructionAPI/make.module.tmpl -@@ -21,7 +21,7 @@ LDFLAGS += -lcommon - LDFLAGS += -L../../common/$(PLATFORM) - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared $(G_PTHREAD_LD) -+LDFLAGS += -shared $(G_PTHREAD_LD) -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += -fPIC -g - CXXFLAGS += -fPIC $(G_PTHREAD) -felide-constructors -g - else -diff --git a/parseAPI/make.module.tmpl dyninst/parseAPI/make.module.tmpl -index ee27ef6..59bb98d 100644 ---- a/parseAPI/make.module.tmpl -+++ dyninst/parseAPI/make.module.tmpl -@@ -19,7 +19,7 @@ LDFLAGS += -L../../common/$(PLATFORM) -L../../symtabAPI/$(PLATFORM) -lcommon -ls - LDFLAGS += $(LIBDIR) - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared $(G_PTHREAD_LD) -+LDFLAGS += -shared $(G_PTHREAD_LD) -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += -fPIC - CXXFLAGS += -fPIC $(G_PTHREAD) - else -diff --git a/proccontrol/make.module.tmpl dyninst/proccontrol/make.module.tmpl -index 10522ac..d0cc6ed 100644 ---- a/proccontrol/make.module.tmpl -+++ dyninst/proccontrol/make.module.tmpl -@@ -39,7 +39,7 @@ LDFLAGS += -L../../common/$(PLATFORM) - - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared -+LDFLAGS += -shared -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += - CXXFLAGS += - else -diff --git a/stackwalk/make.module.tmpl dyninst/stackwalk/make.module.tmpl -index 16e7c07..f68eab7 100644 ---- a/stackwalk/make.module.tmpl -+++ dyninst/stackwalk/make.module.tmpl -@@ -31,7 +31,7 @@ endif - LDFLAGS += -L$(TO_CORE)/common/$(PLATFORM) -L$(LIBRARY_DEST) - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared -+LDFLAGS += -shared -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += - CXXFLAGS += - else -diff --git a/symtabAPI/make.module.tmpl dyninst/symtabAPI/make.module.tmpl -index e922497..3c24e17 100644 ---- a/symtabAPI/make.module.tmpl -+++ dyninst/symtabAPI/make.module.tmpl -@@ -57,7 +57,7 @@ endif - - ifndef USES_NATIVE_CC - LD = $(GXX) --LDFLAGS += -shared $(G_PTHREAD_LD) -+LDFLAGS += -shared $(G_PTHREAD_LD) -Wl,-soname,$(TARGET).$(RELEASE_NUM) - CFLAGS += - CXXFLAGS += $(G_PTHREAD) - else diff --git a/dyninst.spec b/dyninst.spec index 9470c75..4017c67 100644 --- a/dyninst.spec +++ b/dyninst.spec @@ -4,7 +4,7 @@ Summary: An API for Run-time Code Generation License: LGPLv2+ Name: dyninst Group: Development/Libraries -Release: 0.12%{?dist} +Release: 0.14%{?dist} URL: http://www.dyninst.org Version: %version Exclusiveos: linux @@ -14,13 +14,11 @@ ExcludeArch: s390 s390x %{arm} # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: # git clone http://git.dyninst.org/dyninst.git; cd dyninst -# git archive --format=tar.gz --prefix=dyninst/ e3ed0acc46dcecb88db6a884fe8cdcc0bf4fde9d > dyninst-7.99.tar.gz +# git archive --format=tar.gz --prefix=dyninst/ c6ac3093d5c6a9480c575d9930bf8428bcf47f2a > dyninst-7.99.tar.gz # git clone http://git.dyninst.org/docs.git; cd docs # git archive --format=tar.gz fe92e5b28804791ecadc893e469bc2215dbc3066 > dyninst-docs-7.99.tar.gz Source0: %{name}-%{version}.tar.gz Source1: %{name}-docs-%{version}.tar.gz -Patch1: dyninst-notest.patch -Patch2: dyninst-vers.patch # Change version number so official dyninst 8.0 will replace it Patch3: dyninst-git.patch BuildRequires: libxml2-devel >= 2.7.8 @@ -59,8 +57,6 @@ the dyninst user-space libraries and interfaces. %setup -q -n %{name}-%{version} -c %setup -q -T -D -a 1 -%patch1 -p1 -%patch2 -p0 -b .vers %patch3 -p1 -b .git %build @@ -125,6 +121,9 @@ chmod 644 %{buildroot}%{_libdir}/dyninst/*.a %{_libdir}/dyninst/*.a %changelog +* Mon Jun 25 2012 William Cohen - 7.99-0.14 +- Rebase on newer git repo. + * Tue Jun 19 2012 William Cohen - 7.99-0.12 - Fix static library and header file permissions. - Use sources from the dyninst git repositories. diff --git a/sources b/sources index e23d251..a0f49d7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f06cbe88bf5c97aa626ac4f541c01e77 dyninst-7.99.tar.gz +b48f81266cd6b12fdbd80e902afe2da9 dyninst-7.99.tar.gz be21f6a11b37a386e8b4ad16a86e3715 dyninst-docs-7.99.tar.gz