Project

General

Profile

Actions

Bug #59

closed

sparc build broken

Added by Garrett D'Amore over 10 years ago. Updated over 10 years ago.

Status:
Resolved
Priority:
High
Category:
-
Start date:
2010-08-19
Due date:
% Done:

100%

Estimated time:
1.00 h
Difficulty:
Tags:
Gerrit CR:

Description

My lib_i18n changes busted the SPARC build. Please fix.

Actions #1

Updated by Garrett D'Amore over 10 years ago

Suggested fix:

diff r 65c0e0c573e1 -r 22a9144ebc27 usr/src/lib/libc/sparc/Makefile.com
--
a/usr/src/lib/libc/sparc/Makefile.com Thu Aug 19 21:42:46 2010 0700
++ b/usr/src/lib/libc/sparc/Makefile.com Fri Aug 20 15:33:04 2010 +1000
@ -789,6 +789,7 @
fnmatch.o \
fgetwc.o \
fgetws.o \
fix_grouping.o \
fputwc.o \
fputws.o \
fwide.o \
@ -807,6 +808,7 @
mbrlen.o \
mbrtowc.o \
mbsinit.o \
+ mbsnrtowcs.o \
mbsrtowcs.o \
mbstowcs.o \
mbtowc.o \
@ -836,9 +838,10 @
wcrtomb.o \
wcscoll.o \
wcsftime.o \
+ wcsnrtombs.o \
wcsrtombs.o \
+ wcstombs.o \
wcswidth.o \
wcstombs.o \
wcsxfrm.o \
wctob.o \
wctomb.o \
@ -1035,12 +1038,6 @ # include common library definitions
include $(SRC)/lib/Makefile.lib

# NOTE: libc_i18n.a will be part of libc.so.1. Therefore, the compilation
# conditions such as the settings of CFLAGS and CPPFLAGS for the libc_i18n stuff
# need to be compatible with the ones for the libc stuff. Whenever the changes
# that affect the compilation conditions of libc happened, those for libc_i18n
# also need to be updated.
# we need to override the default SONAME here because we might # be building a variant object (still libc.so.1, but different filename)
SONAME = libc.so.1
@ -1062,7 +1059,6 @

ALTPICS= $(TRACEOBJS:%=pics/%)

-$(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a
$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)

MAPFILES =     $(LIBCDIR)/port/mapfile-vers
diff r 65c0e0c573e1 -r 22a9144ebc27 usr/src/lib/libc/sparcv9/Makefile.com
--
a/usr/src/lib/libc/sparcv9/Makefile.com Thu Aug 19 21:42:46 2010 0700
++ b/usr/src/lib/libc/sparcv9/Makefile.com Fri Aug 20 15:33:04 2010 +1000
@ -738,6 +738,7 @
fnmatch.o \
fgetwc.o \
fgetws.o \
fix_grouping.o \
fputwc.o \
fputws.o \
fwide.o \
@ -756,6 +757,7 @
mbrlen.o \
mbrtowc.o \
mbsinit.o \
+ mbsnrtowcs.o \
mbsrtowcs.o \
mbstowcs.o \
mbtowc.o \
@ -785,9 +787,10 @
wcrtomb.o \
wcscoll.o \
wcsftime.o \
+ wcsnrtombs.o \
wcsrtombs.o \
+ wcstombs.o \
wcswidth.o \
wcstombs.o \
wcsxfrm.o \
wctob.o \
wctomb.o \
@ -982,12 +985,6 @
include $(SRC)/lib/Makefile.lib
include $(SRC)/lib/Makefile.lib.64

# NOTE: libc_i18n.a will be part of libc.so.1. Therefore, the compilation
# conditions such as the settings of CFLAGS and CPPFLAGS for the libc_i18n stuff
# need to be compatible with the ones for the libc stuff. Whenever the changes
# that affect the compilation conditions of libc happened, those for libc_i18n
# also need to be updated.
# we need to override the default SONAME here because we might # be building a variant object (still libc.so.1, but different filename)
SONAME = libc.so.1
@ -1009,7 +1006,6 @

ALTPICS= $(TRACEOBJS:%=pics/%)

-$(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
$(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)

MAPFILES =     $(LIBCDIR)/port/mapfile-vers
Actions #2

Updated by Garrett D'Amore over 10 years ago

  • Status changed from New to Resolved
  • % Done changed from 0 to 100
  • Estimated time set to 1.00 h

Integrated.

Actions

Also available in: Atom PDF