Attachment #1933 for issue #5633

View | Details | Raw Unified | Return to issue 5633
Collapse All | Expand All




  	  verstring="sgi$major.$revision"
  
  	  # Add in all the interfaces that we are compatible with.
*** misc/build/freetype-2.0.5/builds/unix/configure	Thu Jun  6 21:09:19 2002
--- misc/build/freetype-2.0.5/builds/unix/configure	Thu Jun  6 21:02:08 2002
***************
*** 5590,5596 ****
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
      #        yet detect zsh echo's removal of \ escapes.
!     archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes
--- 5590,5596 ----
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
      #        yet detect zsh echo's removal of \ escapes.
!     archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -flat_namespace -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
      hardcode_direct=yes

Lines 71-76 Link Here

(-)makefile.mk (-1 / +10 lines)
71		71
72	# --- Files --------------------------------------------------------	72	# --- Files --------------------------------------------------------
73		73
		74	.IF "$(GUIBASE)" == "aqua"
		75
		76	dummy:
		77	@echo "Nothing to build for GUIBASE $(GUIBASE)"
		78
		79	.ELSE # "$(GUIBASE)" == "aqua"
		80
74	TARFILE_NAME=freetype-2.0.5	81	TARFILE_NAME=freetype-2.0.5
75		82
76	PATCH_FILE_NAME=freetype-2.0.5.patch	83	PATCH_FILE_NAME=freetype-2.0.5.patch
Lines 90-96 Link Here
90	.IF "$(GUI)"=="UNX"	97	.IF "$(GUI)"=="UNX"
91	OUT2LIB= \	98	OUT2LIB= \
92	objs$/.libs$/libfreetype.a \	99	objs$/.libs$/libfreetype.a \
93	objs$/.libs$/libfreetype.so.6*	100	objs$/.libs$/libfreetype.so.6* \
		101	objs$/.libs$/libfreetype.*.dylib
94		102
95	.ENDIF # "$(GUI)"=="UNX"	103	.ENDIF # "$(GUI)"=="UNX"
96		104
Lines 129-132 Link Here
129		137
130	ALLTAR : TG_DELIVER	138	ALLTAR : TG_DELIVER
131	.ENDIF # "$(BUILD_SOSL)"!=""	139	.ENDIF # "$(BUILD_SOSL)"!=""
		140	.ENDIF # "$(GUIBASE)" == "aqua"
132		141

Return to issue 5633

Lines 116-118 Link Here

(-)freetype-2.0.5.patch (+19 lines)
116	verstring="sgi$major.$revision"	116	verstring="sgi$major.$revision"
117		117
118	# Add in all the interfaces that we are compatible with.	118	# Add in all the interfaces that we are compatible with.
		119	*** misc/build/freetype-2.0.5/builds/unix/configure Thu Jun 6 21:09:19 2002
		120	--- misc/build/freetype-2.0.5/builds/unix/configure Thu Jun 6 21:02:08 2002
		121	***************
		122	* 5590,5596 **
		123	# FIXME: Relying on posixy $() will cause problems for
		124	# cross-compilation, but unfortunately the echo tests do not
		125	# yet detect zsh echo's removal of \ escapes.
		126	! archive_cmds='$CC $(test .$module = .yes && echo -bundle \|\| echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
		127	# We need to add '_' to the symbols in $export_symbols first
		128	#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
		129	hardcode_direct=yes
		130	--- 5590,5596 ----
		131	# FIXME: Relying on posixy $() will cause problems for
		132	# cross-compilation, but unfortunately the echo tests do not
		133	# yet detect zsh echo's removal of \ escapes.
		134	! archive_cmds='$CC $(test .$module = .yes && echo -bundle \|\| echo -dynamiclib) $allow_undefined_flag -flat_namespace -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
		135	# We need to add '_' to the symbols in $export_symbols first
		136	#archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
		137	hardcode_direct=yes