diff options
Diffstat (limited to 'devel/libslang/patches/patch-aa')
| -rw-r--r-- | devel/libslang/patches/patch-aa | 138 |
1 files changed, 62 insertions, 76 deletions
diff --git a/devel/libslang/patches/patch-aa b/devel/libslang/patches/patch-aa index d62fab8b6ca..5fe8531a31b 100644 --- a/devel/libslang/patches/patch-aa +++ b/devel/libslang/patches/patch-aa @@ -1,76 +1,62 @@ -*** src/Makefile.in.orig Tue Jan 21 20:21:34 1997 ---- src/Makefile.in Mon Jan 27 23:49:32 1997 -*************** -*** 2,16 **** - #--------------------------------------------------------------------------- - # ANSI C compiler - #--------------------------------------------------------------------------- -! CC = @CC@ -! CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - #--------------------------------------------------------------------------- - # ELF specific (Linux) - #--------------------------------------------------------------------------- -! ELF_CC = gcc -! ELF_CFLAGS = -O2 -fno-strength-reduce -fPIC -! ELF_LINK = gcc -shared -Wl,-lm,-t,-soname# - #--------------------------------------------------------------------------- - # Set these values to ABSOLUTE path names - #--------------------------------------------------------------------------- ---- 2,16 ---- - #--------------------------------------------------------------------------- - # ANSI C compiler - #--------------------------------------------------------------------------- -! #CC = @CC@ -! #CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - #--------------------------------------------------------------------------- - # ELF specific (Linux) - #--------------------------------------------------------------------------- -! ELF_CC = $(CC) -! ELF_CFLAGS = $(CFLAGS) -DPIC -fpic -! ELF_LINK = ld -Bshareable - #--------------------------------------------------------------------------- - # Set these values to ABSOLUTE path names - #--------------------------------------------------------------------------- -*************** -*** 93,103 **** - # cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR) - $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS) - -$(RM) $(ELFDIR_ELF_LIB) -! cd $(ELFDIR); $(ELF_LINK),$(ELFLIB_MAJOR) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) -! cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) - @echo "" - @echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR). -- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created. - @echo "" - $(OBJDIR) : - -$(MKDIR) $(OBJDIR) ---- 93,101 ---- - # cd $(ELFDIR); $(RM) $(ELFLIB_MAJOR); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR) - $(ELFDIR_ELF_LIB): $(ELFDIR) $(ELFOBJS) - -$(RM) $(ELFDIR_ELF_LIB) -! cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) - @echo "" - @echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR). - @echo "" - $(OBJDIR) : - -$(MKDIR) $(OBJDIR) -*************** -*** 124,138 **** - install-elf: install elf $(install_lib_dir) $(install_include_dir) $(ELFDIR_ELF_LIB) - $(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir) - $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir) -- -$(RM) $(install_lib_dir)/$(ELFLIB) -- -$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR) - @echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir) - $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir) -- @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR) -- -cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB) - @echo "" - @echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir). -- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created. - @echo "" - install-links: - -$(RM) $(install_lib_dir)/$(ELFLIB) ---- 122,131 ---- +--- src/Makefile.in.orig Wed Jul 15 09:23:28 1998 ++++ src/Makefile.in Wed Jul 15 09:45:35 1998 +@@ -2,9 +2,9 @@ + #--------------------------------------------------------------------------- + # ANSI C compiler + #--------------------------------------------------------------------------- +-CC = @CC@ +-CFLAGS = @CFLAGS@ +-LDFLAGS = @LDFLAGS@ ++CC = ${LIBTOOL} cc ++CFLAGS = -O2 ++LDFLAGS = libslang.la -ltermcap + #--------------------------------------------------------------------------- + # ELF specific (Linux) + #--------------------------------------------------------------------------- +@@ -17,7 +17,7 @@ + # Set these values to ABSOLUTE path names + #--------------------------------------------------------------------------- + SRCDIR = @SRCDIR@# Location of sources +-OBJDIR = @OBJDIR@# Location of objects ++OBJDIR = .# Location of objects + ELFDIR = @ELFDIR@# Location of elf objects + + #--------------------------------------------------------------------------- +@@ -57,13 +57,13 @@ + ELF_MINOR_VERSION = @slang_minor_version@# + + CONFIG_H = config.h +-ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES) ++CFLAGS += -Dunix $(THIS_LIB_DEFINES) + ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES) + COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) + ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS) + ELF_LINK_CMD = @ELF_LINK_CMD@ + +-NORMAL_LIB = lib$(THIS_LIB).a ++NORMAL_LIB = lib$(THIS_LIB).la + OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB) + + ELFLIB = lib$(THIS_LIB).so# +@@ -90,8 +90,8 @@ + + $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS) + -$(RM) $(OBJDIR_NORMAL_LIB) +- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES) +- $(RANLIB) $(OBJDIR_NORMAL_LIB) ++ cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \ ++ -rpath $(PREFIX)/lib -version-info 1:2 + @echo "" + @echo $(NORMAL_LIB) created in $(OBJDIR) + +@@ -115,9 +115,7 @@ + #--------------------------------------------------------------------------- + install: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB) + @echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir) +- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir) +- $(RANLIB) $(install_lib_dir)/$(NORMAL_LIB) +- chmod 644 $(install_lib_dir)/$(NORMAL_LIB) ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir) + @echo installing slang.h and slcurses.h in $(install_include_dir) + $(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir) + $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir) |