diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-11-28 07:01:35 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-11-28 07:01:35 +0000 |
| commit | 414df882d34ac94fff669ed9f60c30bb8ff94153 (patch) | |
| tree | a43aea311a11adb91b185f9890a00bf6f4ce5b07 /app-emulation/dynamips/files | |
| parent | Keyworded for ~amd64-fbsd. See #529084. (diff) | |
| download | historical-414df882d34ac94fff669ed9f60c30bb8ff94153.tar.gz historical-414df882d34ac94fff669ed9f60c30bb8ff94153.tar.bz2 historical-414df882d34ac94fff669ed9f60c30bb8ff94153.zip | |
bump; build system has changed to cmake, patch to remove install_doc function from cmake, drop disused patch & oldest version, closes bug #527550
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D
Diffstat (limited to 'app-emulation/dynamips/files')
| -rw-r--r-- | app-emulation/dynamips/files/0.2.14-docs.patch | 20 | ||||
| -rw-r--r-- | app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch | 52 |
2 files changed, 20 insertions, 52 deletions
diff --git a/app-emulation/dynamips/files/0.2.14-docs.patch b/app-emulation/dynamips/files/0.2.14-docs.patch new file mode 100644 index 000000000000..1d744062e5b5 --- /dev/null +++ b/app-emulation/dynamips/files/0.2.14-docs.patch @@ -0,0 +1,20 @@ +--- CMakeLists-orig.txt 2014-11-28 14:51:14.375913296 +0900 ++++ CMakeLists.txt 2014-11-28 14:52:09.579369288 +0900 +@@ -37,16 +37,6 @@ + add_subdirectory ( stable ) + add_subdirectory ( unstable ) + +-install_docs ( +- "ChangeLog" +- "COPYING" +- "MAINTAINERS" +- "README" +- "README.hypervisor" +- "RELEASE-NOTES" +- "TODO" +- ) +- + # uninstall target - leaves behind any directory created during install + set ( _templatefile "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" ) + set ( _scriptfile "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" ) + diff --git a/app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch b/app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch deleted file mode 100644 index 89f22c2b6244..000000000000 --- a/app-emulation/dynamips/files/dynamips-0.2.10-makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- stable/Makefile.orig 2013-10-20 11:17:50.242929187 +0400 -+++ stable/Makefile 2013-10-20 11:19:19.395936956 +0400 -@@ -3,12 +3,7 @@ -
- # Replace x86 by amd64 for a build on x86_64.
- # Use "nojit" for architectures that are not x86 or x86_64.
--DYNAMIPS_ARCH?=x86
--#DYNAMIPS_ARCH?=amd64
--
--ifeq ($(DYNAMIPS_ARCH),ppc32)
--DYNAMIPS_ARCH=x86
--endif
-+DYNAMIPS_ARCH?=nojit
-
- # Get include files from the current directory and from the common directory
- INCLUDE+=-I. -I../common
-@@ -47,7 +42,7 @@ - PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
- OSNAME=unknown
-
--CFLAGS+= $(INCLUDE) -Wall -O2 -fomit-frame-pointer \
-+CFLAGS+= $(INCLUDE) -Wall \
- -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
- -DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
- -DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
-@@ -72,7 +67,7 @@ - # PCAP_LIB=-lpcap
- OSNAME=Linux
- CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
-- LIBS=-L/usr/lib -L. -ldl -lrt -luuid -lelf $(PTHREAD_LIBS)
-+ LIBS=$(LDFLAGS) -L/usr/lib -L. -ldl -lrt -luuid -lelf $(PTHREAD_LIBS)
- DESTDIR=/usr
- else
- ifeq ($(shell uname -s), Darwin)
-@@ -274,7 +269,7 @@ -
- asmdefs$(BIN_EXT): asmdefs.c mips64.h
- @echo "Linking $@"
-- @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
-+ @$(CC) -Wall $(CFLAGS) $(LDFLAGS) -o $@ asmdefs.c
-
- asmdefs.h: asmdefs$(BIN_EXT)
- @echo "Building assembly definitions header file"
-@@ -282,7 +277,7 @@ -
- nvram_export$(BIN_EXT): nvram_export.o fs_nvram.o
- @echo "Linking $@"
-- @$(CC) -Wall $(CFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o
-+ @$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o $@ nvram_export.o fs_nvram.o
-
- install: $(PROG) nvram_export$(BIN_EXT)
- @echo "Installing"
|