public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/emilpro/, dev-util/emilpro/files/
@ 2015-09-21 19:52 Richard Farina
  0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina @ 2015-09-21 19:52 UTC (permalink / raw
  To: gentoo-commits

commit:     23e5561a2757175019959ef9a8ed5417238d3d8d
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:52:10 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:52:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e5561a

dev-util/emilpro: fix for new binutils and fix bug #553254

 .../{emilpro-3-r1.ebuild => emilpro-3-r2.ebuild}   | 11 +++-
 dev-util/emilpro/emilpro-9999.ebuild               | 13 +++-
 .../files/emilpro-9999-use-gentoo-binutils.patch   | 39 ++++++++++++
 dev-util/emilpro/files/or1k-2.patch                | 22 +++++++
 dev-util/emilpro/files/or1k.patch                  | 70 ++++++++++++++++++++++
 5 files changed, 150 insertions(+), 5 deletions(-)

diff --git a/dev-util/emilpro/emilpro-3-r1.ebuild b/dev-util/emilpro/emilpro-3-r2.ebuild
similarity index 83%
rename from dev-util/emilpro/emilpro-3-r1.ebuild
rename to dev-util/emilpro/emilpro-3-r2.ebuild
index b5c741b..fb55946 100644
--- a/dev-util/emilpro/emilpro-3-r1.ebuild
+++ b/dev-util/emilpro/emilpro-3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,12 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0
 	dev-cpp/libxmlpp:2.6
-	system-binutils? ( sys-devel/binutils[multitarget] )
+	dev-cpp/glibmm
+	dev-cpp/pangomm
+	dev-cpp/cairomm
+	dev-libs/libsigc++:2
+	dev-libs/glib:2
+	system-binutils? ( >=sys-devel/binutils-2.25.1-r1:*[multitarget] )
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
@@ -39,6 +44,8 @@ src_prepare() {
 	else
 		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
 	fi
+	epatch "${FILESDIR}"/or1k.patch
+	epatch "${FILESDIR}"/or1k-2.patch
 	cmake-utils_src_prepare
 }
 

diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index cba20f0..f91969c 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,13 +28,20 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/gtkmm:3.0
 	dev-cpp/gtksourceviewmm:3.0
 	dev-cpp/libxmlpp:2.6
-	system-binutils? ( sys-devel/binutils[multitarget] )
+	dev-cpp/glibmm
+	dev-cpp/pangomm
+	dev-cpp/cairomm
+	dev-libs/libsigc++:2
+	dev-libs/glib:2
+	system-binutils? ( >=sys-devel/binutils-2.25.1-r1:*[multitarget] )
 	net-misc/curl"
+# automagic dep
+# dev-util/capstone
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	if use system-binutils; then
-		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+		epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch
 	else
 		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
 	fi

diff --git a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
new file mode 100644
index 0000000..8cfa9f5
--- /dev/null
+++ b/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
@@ -0,0 +1,39 @@
+--- CMakeLists.txt.orig	2015-06-25 22:02:55.041406946 +0200
++++ CMakeLists.txt	2015-06-25 22:03:51.841696845 +0200
+@@ -11,7 +11,6 @@
+ set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ # Dependencies
+-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
+ 
+ find_package (LibElf REQUIRED)
+ find_package (PkgConfig REQUIRED)
+@@ -30,10 +29,6 @@
+ pkg_check_modules(LIBCURL REQUIRED libcurl)
+ 
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread")
+-LINK_DIRECTORIES(
+-	${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64
+-	${CMAKE_BINARY_DIR}/binutils/libiberty
+-	)
+ 
+ if (HAVE_BFD_MULTIARCH)
+ 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
+@@ -109,7 +104,6 @@
+ set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
+ 
+ include_directories(
+-	${CMAKE_BINARY_DIR}/install-binutils/include/
+ 	src/gtk/include/
+ 	src/include/
+ 	${CMAKE_BINARY_DIR}
+@@ -131,9 +125,6 @@
+ 	tools/squash-instruction-models.cc
+ 	)
+ 
+-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
+-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
+-
+ set (BASE_LIBS
+ 	${LIBELF_LIBRARIES}
+ 	opcodes

diff --git a/dev-util/emilpro/files/or1k-2.patch b/dev-util/emilpro/files/or1k-2.patch
new file mode 100644
index 0000000..9dd4e19
--- /dev/null
+++ b/dev-util/emilpro/files/or1k-2.patch
@@ -0,0 +1,22 @@
+From 5b41e51bfb9fdeac7c6a2441badf8c3b92463fef Mon Sep 17 00:00:00 2001
+From: Alex Chernetz <andy80586@gmail.com>
+Date: Fri, 1 May 2015 14:34:31 -0700
+Subject: [PATCH] Function is print_insn_or1k, not print_insn_little_or1k
+
+---
+ src/bfd-disassembly.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc
+index bf3e768..eeecbe4 100644
+--- a/src/bfd-disassembly.cc
++++ b/src/bfd-disassembly.cc
+@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly,
+ 	    m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k);      /* Motorola 68xxx */
+ 	    m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax);       /* DEC Vax */
+ 	    m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960);      /* Intel 960 */
+-	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k);      /* OpenRISC 32 */
++	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_or1k);      /* OpenRISC 32 */
+ 	    m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc);     /* SPARC */
+ 	    m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu);       /* PowerPC SPU */
+ 	    m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860);      /* Intel 860 */

diff --git a/dev-util/emilpro/files/or1k.patch b/dev-util/emilpro/files/or1k.patch
new file mode 100644
index 0000000..e7a4392
--- /dev/null
+++ b/dev-util/emilpro/files/or1k.patch
@@ -0,0 +1,70 @@
+From f59c5f424a268313c1fcc009fd1e40c00bf6c4f2 Mon Sep 17 00:00:00 2001
+From: Alex Chernetz <andy80586@gmail.com>
+Date: Fri, 1 May 2015 13:32:27 -0700
+Subject: [PATCH] or32 and openrisc architectures are replaced by or1k in
+ current binutils
+
+---
+ src/architecturefactory.cc | 6 ++----
+ src/bfd-disassembly.cc     | 3 +--
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/architecturefactory.cc b/src/architecturefactory.cc
+index 709b770..25ccf80 100644
+--- a/src/architecturefactory.cc
++++ b/src/architecturefactory.cc
+@@ -10,7 +10,7 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_architectureNameMap[(unsigned)bfd_arch_m68k] = "m68k";
+ 	m_architectureNameMap[(unsigned)bfd_arch_vax] = "vax";
+ 	m_architectureNameMap[(unsigned)bfd_arch_i960] = "i960";
+-	m_architectureNameMap[(unsigned)bfd_arch_or32] = "or32";
++	m_architectureNameMap[(unsigned)bfd_arch_or1k] = "or1k";
+ 	m_architectureNameMap[(unsigned)bfd_arch_sparc] = "sparc";
+ 	m_architectureNameMap[(unsigned)bfd_arch_mips] = "mips";
+ 	m_architectureNameMap[(unsigned)bfd_arch_i386] = "i386";
+@@ -68,7 +68,6 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_architectureNameMap[(unsigned)bfd_arch_cris] = "cris";
+ 	m_architectureNameMap[(unsigned)bfd_arch_s390] = "s390";
+ 	m_architectureNameMap[(unsigned)bfd_arch_score] = "score";
+-	m_architectureNameMap[(unsigned)bfd_arch_openrisc] = "openrisc";
+ 	m_architectureNameMap[(unsigned)bfd_arch_mmix] = "mmix";
+ 	m_architectureNameMap[(unsigned)bfd_arch_xstormy16] =  "xstormy16";
+ 	m_architectureNameMap[(unsigned)bfd_arch_xc16x] = "xc16x";
+@@ -81,7 +80,7 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_nameArchitectureMap["m68k"] = (unsigned)bfd_arch_m68k;
+ 	m_nameArchitectureMap["vax"] = (unsigned)bfd_arch_vax;
+ 	m_nameArchitectureMap["i960"] = (unsigned)bfd_arch_i960;
+-	m_nameArchitectureMap["or32"] = (unsigned)bfd_arch_or32;
++	m_nameArchitectureMap["or1k"] = (unsigned)bfd_arch_or1k;
+ 	m_nameArchitectureMap["sparc"] = (unsigned)bfd_arch_sparc;
+ 	m_nameArchitectureMap["mips"] = (unsigned)bfd_arch_mips;
+ 	m_nameArchitectureMap["i386"] = (unsigned)bfd_arch_i386;
+@@ -139,7 +138,6 @@ ArchitectureFactory::ArchitectureFactory() :
+ 	m_nameArchitectureMap["cris"] = (unsigned)bfd_arch_cris;
+ 	m_nameArchitectureMap["s390"] = (unsigned)bfd_arch_s390;
+ 	m_nameArchitectureMap["score"] = (unsigned)bfd_arch_score;
+-	m_nameArchitectureMap["openrisc"] = (unsigned)bfd_arch_openrisc;
+ 	m_nameArchitectureMap["mmix"] = (unsigned)bfd_arch_mmix;
+ 	m_nameArchitectureMap["xstormy16"] =  (unsigned)bfd_arch_xstormy16;
+ 	m_nameArchitectureMap["xc16x"] = (unsigned)bfd_arch_xc16x;
+diff --git a/src/bfd-disassembly.cc b/src/bfd-disassembly.cc
+index 5cda9e2..bf3e768 100644
+--- a/src/bfd-disassembly.cc
++++ b/src/bfd-disassembly.cc
+@@ -38,7 +38,7 @@ class Disassembly : public IDisassembly,
+ 	    m_arch[bfd_arch_m68k] = BfdArch(bfd_arch_m68k, bfd_mach_m68040, print_insn_m68k);      /* Motorola 68xxx */
+ 	    m_arch[bfd_arch_vax] = BfdArch(bfd_arch_vax, 0, print_insn_vax);       /* DEC Vax */
+ 	    m_arch[bfd_arch_i960] = BfdArch(bfd_arch_i960, 0, print_insn_i960);      /* Intel 960 */
+-	    m_arch[bfd_arch_or32] = BfdArch(bfd_arch_or32, 0, print_insn_little_or32);      /* OpenRISC 32 */
++	    m_arch[bfd_arch_or1k] = BfdArch(bfd_arch_or1k, 0, print_insn_little_or1k);      /* OpenRISC 32 */
+ 	    m_arch[bfd_arch_sparc] = BfdArch(bfd_arch_sparc, 0, print_insn_sparc);     /* SPARC */
+ 	    m_arch[bfd_arch_spu] = BfdArch(bfd_arch_spu, 0, print_insn_spu);       /* PowerPC SPU */
+ 	    m_arch[bfd_arch_i860] = BfdArch(bfd_arch_i860, 0, print_insn_i860);      /* Intel 860 */
+@@ -89,7 +89,6 @@ class Disassembly : public IDisassembly,
+ 	    m_arch[bfd_arch_rl78] = BfdArch(bfd_arch_rl78, 0, print_insn_rl78);
+ 	    m_arch[bfd_arch_rx] = BfdArch(bfd_arch_rx, 0, print_insn_rx);        /* Renesas RX.  */
+ 	    m_arch[bfd_arch_s390] = BfdArch(bfd_arch_s390, bfd_mach_s390_64, print_insn_s390);      /* IBM s390 */
+-	    m_arch[bfd_arch_openrisc] = BfdArch(bfd_arch_openrisc, 0, print_insn_openrisc);  /* OpenRISC */
+ 	    m_arch[bfd_arch_mmix] = BfdArch(bfd_arch_mmix, 0, print_insn_mmix);      /* Donald Knuth's educational processor.  */
+ 	    m_arch[bfd_arch_xstormy16] = BfdArch(bfd_arch_xstormy16, 0, print_insn_xstormy16);
+ 	    m_arch[bfd_arch_msp430] = BfdArch(bfd_arch_msp430, 0, print_insn_msp430);    /* Texas Instruments MSP430 architecture.  */


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-util/emilpro/, dev-util/emilpro/files/
@ 2016-03-29 18:39 Richard Farina
  0 siblings, 0 replies; 2+ messages in thread
From: Richard Farina @ 2016-03-29 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b4c8e3713282b09a2703d5069c0ed3d856b5eb53
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 18:38:59 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 18:39:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c8e371

dev-util/emilpro: fix bug #561978

Package-Manager: portage-2.2.28

 dev-util/emilpro/emilpro-3-r3.ebuild               |  4 ++--
 dev-util/emilpro/emilpro-9999.ebuild               |  4 ++--
 ...utils.patch => emilpro-3-system-binutils.patch} | 18 +++++++++++++---
 ...ls.patch => emilpro-9999-system-binutils.patch} | 25 ++++++++++++++++------
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild
index 7447e4d..b6c73d1 100644
--- a/dev-util/emilpro/emilpro-3-r3.ebuild
+++ b/dev-util/emilpro/emilpro-3-r3.ebuild
@@ -33,14 +33,14 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/cairomm
 	dev-libs/libsigc++:2
 	dev-libs/glib:2
-	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] )
+	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
 	net-misc/curl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/respect-cflags.patch
 	if use system-binutils; then
-		epatch "${FILESDIR}"/use-gentoo-binutils.patch
+		epatch "${FILESDIR}"/${P}-system-binutils.patch
 	else
 		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
 	fi

diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index dd7ff40..ccf564b 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
 	dev-cpp/cairomm
 	dev-libs/libsigc++:2
 	dev-libs/glib:2
-	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] )
+	system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
 	net-misc/curl"
 # automagic dep
 # dev-util/capstone
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	if use system-binutils; then
-		epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch
+		epatch "${FILESDIR}"/${P}-system-binutils.patch
 	else
 		sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
 	fi

diff --git a/dev-util/emilpro/files/use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
similarity index 65%
rename from dev-util/emilpro/files/use-gentoo-binutils.patch
rename to dev-util/emilpro/files/emilpro-3-system-binutils.patch
index 5760558..d73f402 100644
--- a/dev-util/emilpro/files/use-gentoo-binutils.patch
+++ b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
@@ -1,6 +1,6 @@
-diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
---- emilpro-3/CMakeLists.txt	2013-12-28 04:22:34.000000000 -0500
-+++ emilpro-3-nobinutils/CMakeLists.txt	2014-03-18 14:59:17.983479920 -0400
+diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt
+--- emilpro-3-orig/CMakeLists.txt	2016-03-29 13:19:47.035441401 -0400
++++ emilpro-3/CMakeLists.txt	2016-03-29 13:18:36.650443067 -0400
 @@ -11,7 +11,6 @@
  set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
  
@@ -34,3 +34,15 @@ diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
  
  set (BASE_LIBS
  	${LIBELF_LIBRARIES}
+diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc
+--- emilpro-3-orig/src/namemangler.cc	2016-03-29 13:17:23.957444786 -0400
++++ emilpro-3/src/namemangler.cc	2016-03-29 13:18:57.306442578 -0400
+@@ -1,7 +1,7 @@
+ #include <namemangler.hh>
+ 
+ #include <bfd.h>
+-#include <demangle.h>
++#include <libiberty/demangle.h>
+ 
+ using namespace emilpro;
+ 

diff --git a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
similarity index 61%
rename from dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
rename to dev-util/emilpro/files/emilpro-9999-system-binutils.patch
index 8cfa9f5..194e8d1 100644
--- a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
+++ b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
@@ -1,5 +1,6 @@
---- CMakeLists.txt.orig	2015-06-25 22:02:55.041406946 +0200
-+++ CMakeLists.txt	2015-06-25 22:03:51.841696845 +0200
+diff -Naur emilpro-9999-orig/CMakeLists.txt emilpro-9999/CMakeLists.txt
+--- emilpro-9999-orig/CMakeLists.txt	2016-03-29 14:30:48.017340585 -0400
++++ emilpro-9999/CMakeLists.txt	2016-03-29 14:31:21.335339797 -0400
 @@ -11,7 +11,6 @@
  set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
  
@@ -7,8 +8,8 @@
 -include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
  
  find_package (LibElf REQUIRED)
- find_package (PkgConfig REQUIRED)
-@@ -30,10 +29,6 @@
+ find_package (LibCapstone)
+@@ -40,10 +39,6 @@
  pkg_check_modules(LIBCURL REQUIRED libcurl)
  
  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread")
@@ -19,7 +20,7 @@
  
  if (HAVE_BFD_MULTIARCH)
  	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
-@@ -109,7 +104,6 @@
+@@ -120,7 +115,6 @@
  set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
  
  include_directories(
@@ -27,7 +28,7 @@
  	src/gtk/include/
  	src/include/
  	${CMAKE_BINARY_DIR}
-@@ -131,9 +125,6 @@
+@@ -143,9 +137,6 @@
  	tools/squash-instruction-models.cc
  	)
  
@@ -37,3 +38,15 @@
  set (BASE_LIBS
  	${LIBELF_LIBRARIES}
  	opcodes
+diff -Naur emilpro-9999-orig/src/namemangler.cc emilpro-9999/src/namemangler.cc
+--- emilpro-9999-orig/src/namemangler.cc	2016-03-29 14:30:48.017340585 -0400
++++ emilpro-9999/src/namemangler.cc	2016-03-29 14:31:06.397340150 -0400
+@@ -1,7 +1,7 @@
+ #include <namemangler.hh>
+ 
+ #include <bfd.h>
+-#include <demangle.h>
++#include <libiberty/demangle.h>
+ 
+ using namespace emilpro;
+ 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-29 18:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-21 19:52 [gentoo-commits] repo/gentoo:master commit in: dev-util/emilpro/, dev-util/emilpro/files/ Richard Farina
  -- strict thread matches above, loose matches on Subject: below --
2016-03-29 18:39 Richard Farina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox