rpms/environment-modules
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix compilation with -Werror=implicit-function-declaration

Browse Source 
- Use %license
This commit is contained in:
Orion Poplawski 2016-12-04 10:22:16 -07:00
parent 6d5d9281e0
commit c154200c2e
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
environment-modules-implicit.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up modules-3.2.10/modules_def.h.implicit modules-3.2.10/modules_def.h
--- modules-3.2.10/modules_def.h.implicit 2012-11-01 10:58:27.000000000 -0600
+++ modules-3.2.10/modules_def.h 2016-12-04 10:20:40.981094031 -0700
@@ -616,6 +616,9 @@ extern int ModuleCmd_Load( Tcl_Interp*
/** ModuleCmd_Purge.c **/
extern int ModuleCmd_Purge( Tcl_Interp*, int, char*[]);
+/** ModuleCmd_Refresh.c **/
+extern int ModuleCmd_Refresh( Tcl_Interp*, int, char*[]);
+
/** ModuleCmd_Switch.c **/
extern int ModuleCmd_Switch( Tcl_Interp*, int, char*[]);
@@ -736,6 +739,7 @@ extern int IsLoaded( Tcl_Interp*, char
extern int IsLoaded_ExactMatch( Tcl_Interp*, char*, char **, char*);
extern int Update_LoadedList( Tcl_Interp*, char*, char*);
extern int check_magic( char*, char*, int);
+extern void regex_quote( const char*, char*, int);
extern char *xstrtok_r(char *, const char *, char **);
extern char *xstrtok(char *, const char *);
extern void chk4spch( char*);

12
environment-modules.spec
View File

@ -2,7 +2,7 @@
Name: environment-modules Name: environment-modules
Version: 3.2.10 Version: 3.2.10
Release: 17%{?dist} Release: 18%{?dist}
Summary: Provides dynamic modification of a user's environment Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base Group: System Environment/Base
@ -36,6 +36,8 @@ Patch6: environment-modules-py3-and-doc-fix.patch
# Fix unload from loaded modulefile # Fix unload from loaded modulefile
# https://bugzilla.redhat.com/show_bug.cgi?id=1117334 # https://bugzilla.redhat.com/show_bug.cgi?id=1117334
Patch7: environment-modules-3.2.10-unload-from-module.patch Patch7: environment-modules-3.2.10-unload-from-module.patch
# Fix build with -Werror=implicit-function-declaration
Patch8: environment-modules-implicit.patch
BuildRequires: tcl-devel, tclx-devel, libX11-devel BuildRequires: tcl-devel, tclx-devel, libX11-devel
BuildRequires: dejagnu BuildRequires: dejagnu
@ -81,6 +83,7 @@ have access to the module alias.
%patch5 -p1 -b .tcl86 %patch5 -p1 -b .tcl86
%patch6 -p1 -b .py3 %patch6 -p1 -b .py3
%patch7 -p1 -b .unload-from-module %patch7 -p1 -b .unload-from-module
%patch8 -p1 -b .implicit
%build %build
@ -126,7 +129,8 @@ fi
%files %files
%doc LICENSE.GPL README TODO %license LICENSE.GPL
%doc README TODO
%{_sysconfdir}/modulefiles %{_sysconfdir}/modulefiles
%ghost %{_sysconfdir}/profile.d/modules.csh %ghost %{_sysconfdir}/profile.d/modules.csh
%ghost %{_sysconfdir}/profile.d/modules.sh %ghost %{_sysconfdir}/profile.d/modules.sh
@ -144,6 +148,10 @@ fi
%changelog %changelog
* Sun Dec 4 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2.10-18
- Fix compilation with -Werror=implicit-function-declaration
- Use %%license
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.10-17 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.10-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild