zerochaos 14/03/19 02:50:34 Added: use-gentoo-binutils.patch respect-cflags.patch Log: enable building with system binutils, respect cxxflags (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path 1.1 dev-util/emilpro/files/use-gentoo-binutils.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/files/use-gentoo-binutils.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/files/use-gentoo-binutils.patch?rev=1.1&content-type=text/plain Index: use-gentoo-binutils.patch =================================================================== 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 @@ -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,7 +29,6 @@ pkg_check_modules(LIBCURL libcurl) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1") -LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64) if (HAVE_BFD_MULTIARCH) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH") @@ -110,7 +108,6 @@ src/include/ ${CMAKE_BINARY_DIR} ${LIBELF_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/install-binutils/include/ ${GTKMM_INCLUDE_DIRS} ${GTKSOURCEVIEWMM_INCLUDE_DIRS} ${LIBXMLPP_INCLUDE_DIRS} @@ -128,8 +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} 1.1 dev-util/emilpro/files/respect-cflags.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/files/respect-cflags.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/emilpro/files/respect-cflags.patch?rev=1.1&content-type=text/plain Index: respect-cflags.patch =================================================================== diff -Naur emilpro-3/CMakeLists.txt emilpro-3-cflags/CMakeLists.txt --- emilpro-3/CMakeLists.txt 2013-12-28 04:22:34.000000000 -0500 +++ emilpro-3-cflags/CMakeLists.txt 2014-03-18 17:59:47.534542384 -0400 @@ -29,7 +29,7 @@ pkg_check_modules(LIBXMLPP libxml++-2.6) pkg_check_modules(LIBCURL libcurl) -set (CMAKE_CXX_FLAGS "-std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1") LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64) if (HAVE_BFD_MULTIARCH)
