rpms/ocaml-lwt-log
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update build not to use makefile (and just invoke dune directly).

Browse Source 
Fixes FTBFS in Fedora 32 (rhbz#1799816).
This commit is contained in:
Ben Rosser 2020-02-07 10:47:46 -05:00
parent 9175e36b94
commit 6739344d3a
2 changed files with 2 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lwt-log-fsf-address.patch
View File

@ -1,68 +0,0 @@
diff -rupN lwt_log-1.1.0/src/core/lwt_log_core.mli lwt_log-patched/src/core/lwt_log_core.mli
--- lwt_log-1.1.0/src/core/lwt_log_core.mli 2018-03-30 10:46:06.000000000 -0400
+++ lwt_log-patched/src/core/lwt_log_core.mli 2018-11-22 18:15:43.138000175 -0500
@@ -14,10 +14,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
(** Logging facility *)
diff -rupN lwt_log-1.1.0/src/core/lwt_log_rules.mli lwt_log-patched/src/core/lwt_log_rules.mli
--- lwt_log-1.1.0/src/core/lwt_log_rules.mli 2018-03-30 10:46:06.000000000 -0400
+++ lwt_log-patched/src/core/lwt_log_rules.mli 2018-11-22 18:16:38.627702785 -0500
@@ -13,10 +13,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
(** Logging rules parsing *)
diff -rupN lwt_log-1.1.0/src/unix/lwt_daemon.mli lwt_log-patched/src/unix/lwt_daemon.mli
--- lwt_log-1.1.0/src/unix/lwt_daemon.mli 2018-03-30 10:46:06.000000000 -0400
+++ lwt_log-patched/src/unix/lwt_daemon.mli 2018-11-22 18:16:41.971731957 -0500
@@ -13,10 +13,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
(** Daemon helpers *)
diff -rupN lwt_log-1.1.0/src/unix/lwt_log.mli lwt_log-patched/src/unix/lwt_log.mli
--- lwt_log-1.1.0/src/unix/lwt_log.mli 2018-03-30 10:46:06.000000000 -0400
+++ lwt_log-patched/src/unix/lwt_log.mli 2018-11-22 18:16:46.863774633 -0500
@@ -14,10 +14,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
(** Logging functions

6
ocaml-lwt-log.spec
View File

@ -29,15 +29,13 @@ developing applications that use %{name}.
%prep
%autosetup -n lwt_log-%{version}
sed 's/jbuilder build --dev/jbuilder build/g' -i Makefile
%build
%make_build
dune build
%install
export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR
jbuilder install --prefix %{buildroot}%{_prefix}/ --lib %{buildroot}%{_libdir}/ocaml/
dune install --prefix %{buildroot}%{_prefix}/ --lib %{buildroot}%{_libdir}/ocaml/
# Remove .ml files.
rm -rf %{buildroot}%{_libdir}/ocaml/lwt_log/*.ml