equal
deleted
inserted
replaced
67 $(GSED) -i \ |
67 $(GSED) -i \ |
68 -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ |
68 -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ |
69 -e 's|need_relink=yes|need_relink=not_on_solaris|' \ |
69 -e 's|need_relink=yes|need_relink=not_on_solaris|' \ |
70 libtool) |
70 libtool) |
71 |
71 |
72 ifeq ($(OS_VERSION),5.11) |
72 LIBS += $(LIBSOCKET) $(LIBNSL) |
73 LIBS += -lsocket -lnsl |
|
74 CONFIGURE_ENV += LIBS="$(LIBS)" |
73 CONFIGURE_ENV += LIBS="$(LIBS)" |
75 endif |
|
76 |
74 |
77 # Prevent older versions of libMagick{Core,Wand}-6.Q16.so from the build |
75 # Prevent older versions of libMagick{Core,Wand}-6.Q16.so from the build |
78 # machine from being found ahead of new versions from the proto area. |
76 # machine from being found ahead of new versions from the proto area. |
79 LD_OPTIONS_SO= -L. -L../../magick/.libs |
77 LD_OPTIONS_SO= -L. -L../../magick/.libs |
80 COMPONENT_BUILD_ENV += LD_OPTIONS_SO="$(LD_OPTIONS_SO)" |
78 COMPONENT_BUILD_ENV += LD_OPTIONS_SO="$(LD_OPTIONS_SO)" |