pool/emacs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=183
This commit is contained in:
Dr. Werner Fink 2015-11-10 09:59:03 +00:00 committed by Git OBS Bridge
parent a5740b7ebe
commit 40bb50c5fc
3 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
emacs-24.4-glibc.patch
View File

@ -40,31 +40,3 @@
esac esac
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2014-10-21 13:55:07.003837593 +0000
@@ -314,13 +314,15 @@ test-distrib${EXEEXT}: ${srcdir}/test-di
../lib/libgnu.a: $(config_h)
cd ../lib && $(MAKE) libgnu.a
+#REGEXPOBJ =
+REGEXPOBJ = regex.o
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
- regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
+ $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o etags${EXEEXT}
ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
$(config_h)
@@ -332,7 +334,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
ctags${EXEEXT}: etags${EXEEXT}
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
- regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
+ $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \

4
emacs-24.4.dif
View File

@ -182,8 +182,8 @@
+gnuctags${EXEEXT}: etags${EXEEXT} +gnuctags${EXEEXT}: etags${EXEEXT}
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \ -DVERSION="\"${version}\"" ${srcdir}/etags.c \
- $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT} - regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT}
+ $(REGEXPOBJ) $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT} + regex.o $(LOADLIBES) $(NTLIB) -o gnuctags${EXEEXT}
profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \ $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \

8
emacs.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 10 09:17:53 UTC 2015 - werner@suse.de
- Do not enforce the usage of the glibc regular expression as the
GNU emacs ctags program depends on the emacs version (bsc#953745).
For this fix the patch emacs-24.4-glibc.patch and emacs-24.4.dif
had been modified.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 1 10:05:35 UTC 2015 - werner@suse.de Tue Sep 1 10:05:35 UTC 2015 - werner@suse.de