Merge Request #49: Drop dependency on libiberty.so/.a, Author: Bruno Santos, Merge: Henrik Rusche

2016-11-09 11:16:42 +01:00 · 2016-11-09 11:16:42 +01:00 · 3eb1420ae0
commit 3eb1420ae0
parent 973bbe2cb0 40c72875b5
22 changed files with 22 additions and 22 deletions
--- a/doc/buildInstructions/Debian/Ubuntu/Ubuntu_12.04_and_13.10
+++ b/doc/buildInstructions/Debian/Ubuntu/Ubuntu_12.04_and_13.10
@ -23,7 +23,7 @@ http://sourceforge.net/projects/openfoam-extend/files/foam-extend-3.1/

 * Install required packages:

-    sudo apt-get install git-core build-essential binutils-dev flex bison \
+    sudo apt-get install git-core build-essential flex bison \
    zlib1g-dev qt4-dev-tools libqt4-dev libncurses5-dev libxt-dev rpm \
    mercurial graphviz

--- a/doc/buildInstructions/Debian/Ubuntu/Ubuntu_14.04
+++ b/doc/buildInstructions/Debian/Ubuntu/Ubuntu_14.04
@ -28,7 +28,7 @@ http://sourceforge.net/projects/openfoam-extend/files/foam-extend-3.1/

 * Install required packages:

-    sudo apt-get install git-core build-essential binutils-dev flex \
+    sudo apt-get install git-core build-essential flex \
    zlib1g-dev qt4-dev-tools libqt4-dev libncurses5-dev libiberty-dev \
    libxt-dev rpm mercurial graphviz openmpi-bin libopenmpi-dev cmake

--- a/doc/buildInstructions/Fedora/Fedora19
+++ b/doc/buildInstructions/Fedora/Fedora19
@ -24,7 +24,7 @@ http://sourceforge.net/projects/openfoam-extend/files/foam-extend-3.0/
 * Install required packages:

    sudo yum groupinstall "Development Tools"
-    sudo yum install gcc-c++ binutils-devel bison flex m4 zlib-devel \
+    sudo yum install gcc-c++ bison flex m4 zlib-devel \
    qt-devel qtwebkit-devel mercurial graphviz

 * Set environment variables:
--- a/vagrantSandbox/initCentOSRHELScript.sh
+++ b/vagrantSandbox/initCentOSRHELScript.sh
@ -19,7 +19,7 @@ fi

 # some of these packages are already installed. But lets be sure

-neededPackages=(gcc-c++ gcc-gfortran mercurial git flex bison make ccache rpm-build wget zlib-devel binutils-devel libXt-devel cmake)
+neededPackages=(gcc-c++ gcc-gfortran mercurial git flex bison make ccache rpm-build wget zlib-devel libXt-devel cmake)
 bonusPackages=(emacs csh tcsh zsh)

 for p in ${neededPackages[@]}; do
--- a/vagrantSandbox/initOpenSUSEScript.sh
+++ b/vagrantSandbox/initOpenSUSEScript.sh
@ -11,7 +11,7 @@ zypper -n remove patterns-openSUSE-minimal_base-conflicts

 # patterns-openSUSE-devel_python

-neededPackages=(gcc-c++ mercurial git flex bison make ccache zlib-devel rpm-build binutils-devel cmake)
+neededPackages=(gcc-c++ mercurial git flex bison make ccache zlib-devel rpm-build cmake)
 bonusPackages=(emacs csh tcsh zsh)

 for p in ${neededPackages[@]}; do
--- a/vagrantSandbox/initUbunutuScript.sh
+++ b/vagrantSandbox/initUbunutuScript.sh
@ -53,7 +53,7 @@ echo
 echo "Tools for packaging"
 echo

-packagingPackages=(default-mta dpkg-dev debhelper devscripts cdbs binutils-dev)
+packagingPackages=(default-mta dpkg-dev debhelper devscripts cdbs)
 for p in ${packagingPackages[@]}; do
    apt-get -y install $p
 done
--- a/wmake/rules/FreeBSD/general
+++ b/wmake/rules/FreeBSD/general
@ -1,6 +1,6 @@
 CPP        += -D$(WM_ARCH)

-GLIBS      = -liberty -lexecinfo
+GLIBS      = -lexecinfo

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/SiCortex64Gcc/general
+++ b/wmake/rules/SiCortex64Gcc/general
@ -1,7 +1,7 @@
 CPP        = cpp $(GFLAGS)
 LD         = ld -A64

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/SunOS64Gcc/general
+++ b/wmake/rules/SunOS64Gcc/general
@ -1,7 +1,7 @@
 CPP        = cpp $(GFLAGS)
 LD         = ld -64

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket
+PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linux64Gcc45/general
+++ b/wmake/rules/linux64Gcc45/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linux64Gcc46/general
+++ b/wmake/rules/linux64Gcc46/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linux64Gcc47/general
+++ b/wmake/rules/linux64Gcc47/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linux64Gcc49/general
+++ b/wmake/rules/linux64Gcc49/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linux64Icc/general
+++ b/wmake/rules/linux64Icc/general
@ -1,7 +1,7 @@
 CPP        = cpp -P $(GFLAGS)
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linuxIA64Gcc/general
+++ b/wmake/rules/linuxIA64Gcc/general
@ -1,7 +1,7 @@
 CPP        = cpp $(GFLAGS)
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linuxIA64I64/general
+++ b/wmake/rules/linuxIA64I64/general
@ -4,7 +4,7 @@ ARFLAGS    = cr
 RANLIB     = ranlib
 LD         = ld

-GLIBS      = -liberty
+GLIBS      =

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linuxIA64Icc/general
+++ b/wmake/rules/linuxIA64Icc/general
@ -4,7 +4,7 @@ ARFLAGS    = cr
 RANLIB     = ranlib
 LD         = ld

-GLIBS      = -liberty
+GLIBS      =

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linuxIcc/general
+++ b/wmake/rules/linuxIcc/general
@ -1,7 +1,7 @@
 CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -melf_i386

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/linuxPPC64Gcc/general
+++ b/wmake/rules/linuxPPC64Gcc/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp $(GFLAGS)
 LD         = ld -m elf64ppc

-#PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
+#PROJECT_LIBS = -l$(WM_PROJECT) -ldl
 PROJECT_LIBS = -l$(WM_PROJECT) -ldl

 include $(GENERAL_RULES)/standard
--- a/wmake/rules/mingwGcc/general
+++ b/wmake/rules/mingwGcc/general
@ -1,7 +1,7 @@
 CPP        = cpp -traditional-cpp -Dmingw
 LD         = ld

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty
+PROJECT_LIBS = -l$(WM_PROJECT)

 include $(GENERAL_RULES)/standard

--- a/wmake/rules/solarisGcc/general
+++ b/wmake/rules/solarisGcc/general
@ -1,6 +1,6 @@
 CPP        = /usr/lib/cpp -undef $(GFLAGS)

-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket
+PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket

 include $(GENERAL_RULES)/standard