- adjust to use the gcc-4.2.0 release
- adjust default gdb version to 6.6 - fix stripping gmp/mpfr due to recent LIBTGTEXT changes
This commit is contained in:
parent
3342c8c547
commit
c6eb2ed657
@ -86,7 +86,7 @@ $(STAGING_DIR)/lib/$(GMP_BINARY): $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY)
|
|||||||
infodir=$(STAGING_DIR)/info \
|
infodir=$(STAGING_DIR)/info \
|
||||||
mandir=$(STAGING_DIR)/man \
|
mandir=$(STAGING_DIR)/man \
|
||||||
-C $(GMP_TARGET_DIR) install
|
-C $(GMP_TARGET_DIR) install
|
||||||
$(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libgmp.{so*,a}
|
$(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libgmp$(LIBTGTEXT)*
|
||||||
|
|
||||||
$(TARGET_DIR)/lib/libgmp.so $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/lib/libgmp.a: $(STAGING_DIR)/lib/$(GMP_BINARY)
|
$(TARGET_DIR)/lib/libgmp.so $(TARGET_DIR)/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/lib/libgmp.a: $(STAGING_DIR)/lib/$(GMP_BINARY)
|
||||||
cp -dpf $(STAGING_DIR)/lib/libgmp$(LIBTGTEXT) $(TARGET_DIR)/lib/
|
cp -dpf $(STAGING_DIR)/lib/libgmp$(LIBTGTEXT) $(TARGET_DIR)/lib/
|
||||||
|
@ -100,7 +100,7 @@ $(STAGING_DIR)/lib/$(MPFR_BINARY): $(MPFR_TARGET_DIR)/.libs/$(MPFR_BINARY)
|
|||||||
infodir=$(STAGING_DIR)/info \
|
infodir=$(STAGING_DIR)/info \
|
||||||
mandir=$(STAGING_DIR)/man \
|
mandir=$(STAGING_DIR)/man \
|
||||||
-C $(MPFR_TARGET_DIR) install;
|
-C $(MPFR_TARGET_DIR) install;
|
||||||
$(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libmpfr.{so*,a}
|
$(STRIP) --strip-unneeded $(STAGING_DIR)/lib/libmpfr$(LIBTGTEXT)*
|
||||||
|
|
||||||
$(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/lib/libmpfr.a: $(STAGING_DIR)/lib/$(MPFR_BINARY)
|
$(TARGET_DIR)/lib/libmpfr.so $(TARGET_DIR)/lib/libmpfr.so.$(MPFR_LIBVERSION) $(TARGET_DIR)/lib/libmpfr.a: $(STAGING_DIR)/lib/$(MPFR_BINARY)
|
||||||
cp -dpf $(STAGING_DIR)/lib/libmpfr$(LIBTGTEXT) $(TARGET_DIR)/lib/
|
cp -dpf $(STAGING_DIR)/lib/libmpfr$(LIBTGTEXT) $(TARGET_DIR)/lib/
|
||||||
|
@ -4,7 +4,7 @@ comment "Gcc Options"
|
|||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "GCC compiler Version"
|
prompt "GCC compiler Version"
|
||||||
default BR2_GCC_VERSION_4_1_2
|
default BR2_GCC_VERSION_4_2_0
|
||||||
help
|
help
|
||||||
Select the version of gcc you wish to use.
|
Select the version of gcc you wish to use.
|
||||||
|
|
||||||
@ -67,10 +67,14 @@ choice
|
|||||||
depends !BR2_nios2
|
depends !BR2_nios2
|
||||||
bool "gcc 4.1.2"
|
bool "gcc 4.1.2"
|
||||||
|
|
||||||
config BR2_GCC_VERSION_4_2
|
config BR2_GCC_VERSION_4_2_0
|
||||||
depends !BR2_nios2
|
depends !BR2_nios2
|
||||||
select BR2_GCC_IS_SNAP
|
bool "gcc 4.2.0"
|
||||||
bool "gcc 4.2"
|
|
||||||
|
# config BR2_GCC_VERSION_4_3
|
||||||
|
# depends !BR2_nios2
|
||||||
|
# select BR2_GCC_IS_SNAP
|
||||||
|
# bool "gcc 4.3"
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
@ -80,7 +84,7 @@ config BR2_GCC_IS_SNAP
|
|||||||
|
|
||||||
config BR2_GCC_SNAP_DATE
|
config BR2_GCC_SNAP_DATE
|
||||||
string "GCC snapshot date"
|
string "GCC snapshot date"
|
||||||
default "20061121"
|
default "20070601"
|
||||||
depends BR2_GCC_IS_SNAP
|
depends BR2_GCC_IS_SNAP
|
||||||
help
|
help
|
||||||
Enter snapshot date to use for gcc. Format is:
|
Enter snapshot date to use for gcc. Format is:
|
||||||
@ -103,7 +107,8 @@ config BR2_GCC_VERSION
|
|||||||
default "4.1.0" if BR2_GCC_VERSION_4_1_0
|
default "4.1.0" if BR2_GCC_VERSION_4_1_0
|
||||||
default "4.1.1" if BR2_GCC_VERSION_4_1_1
|
default "4.1.1" if BR2_GCC_VERSION_4_1_1
|
||||||
default "4.1.2" if BR2_GCC_VERSION_4_1_2
|
default "4.1.2" if BR2_GCC_VERSION_4_1_2
|
||||||
default "4.2" if BR2_GCC_VERSION_4_2
|
default "4.2.0" if BR2_GCC_VERSION_4_2_0
|
||||||
|
default "4.3" if BR2_GCC_VERSION_4_3
|
||||||
|
|
||||||
|
|
||||||
config BR2_GCC_USE_SJLJ_EXCEPTIONS
|
config BR2_GCC_USE_SJLJ_EXCEPTIONS
|
||||||
|
@ -36,13 +36,17 @@ GCC_STRIP_HOST_BINARIES:=true
|
|||||||
|
|
||||||
ifeq ($(findstring 3.,$(GCC_VERSION)),3.)
|
ifeq ($(findstring 3.,$(GCC_VERSION)),3.)
|
||||||
GCC_NO_MPFR:=y
|
GCC_NO_MPFR:=y
|
||||||
endif
|
else
|
||||||
|
ifneq ($(BR2_INSTALL_FORTRAN),y)
|
||||||
|
# fortran needs gmp and mpfr
|
||||||
ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.)
|
ifeq ($(findstring 4.0.,$(GCC_VERSION)),4.0.)
|
||||||
GCC_NO_MPFR:=y
|
GCC_NO_MPFR:=y
|
||||||
endif
|
endif
|
||||||
#ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
|
ifeq ($(findstring 4.1.,$(GCC_VERSION)),4.1.)
|
||||||
#GCC_NO_MPFR:=y
|
GCC_NO_MPFR:=y
|
||||||
#endif
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
#############################################################
|
#############################################################
|
||||||
#
|
#
|
||||||
|
@ -22,7 +22,7 @@ config BR2_PACKAGE_GDB_HOST
|
|||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "GDB debugger Version"
|
prompt "GDB debugger Version"
|
||||||
default BR2_GDB_VERSION_6_3
|
default BR2_GDB_VERSION_6_6
|
||||||
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
|
depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
|
||||||
help
|
help
|
||||||
Select the version of gdb you wish to use.
|
Select the version of gdb you wish to use.
|
||||||
|
Loading…
Reference in New Issue
Block a user