[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/findlib][master] 3 commits: Remove .PHONY rules



Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / findlib

Commits:

  • 0a768280
    by Stephane Glondu at 2024-08-06T04:43:26+02:00
    Remove .PHONY rules
    
  • d262af98
    by Stephane Glondu at 2024-08-06T04:43:26+02:00
    Remove packages that are already provided by stdlib
    
  • bc44425d
    by Stephane Glondu at 2024-08-06T04:43:26+02:00
    Update changelog
    

2 changed files:

Changes:

  • debian/changelog
    1
    +findlib (1.9.6-3) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * Remove packages that are already provided by stdlib
    
    4
    +
    
    5
    + -- Stéphane Glondu <glondu@debian.org>  Mon, 15 Jul 2024 17:10:20 +0200
    
    6
    +
    
    1 7
     findlib (1.9.6-2) unstable; urgency=medium
    
    2 8
     
    
    3 9
       * Fix build with OCaml 5.x
    

  • debian/rules
    ... ... @@ -9,7 +9,6 @@ include /usr/share/ocaml/ocamlvars.mk
    9 9
     %:
    
    10 10
     	dh $@ --with ocaml,bash-completion
    
    11 11
     
    
    12
    -.PHONY: override_dh_auto_configure
    
    13 12
     override_dh_auto_configure:
    
    14 13
     	./configure \
    
    15 14
     		-config /etc/ocamlfind.conf \
    
    ... ... @@ -20,7 +19,6 @@ override_dh_auto_configure:
    20 19
     		-with-toolbox
    
    21 20
     	sed -i '/INSTALLFILE/s/.*/INSTALLFILE = cp/' Makefile.config
    
    22 21
     
    
    23
    -.PHONY: override_dh_auto_build
    
    24 22
     override_dh_auto_build:
    
    25 23
     	$(MAKE)
    
    26 24
     ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
    
    ... ... @@ -43,7 +41,6 @@ endif
    43 41
     
    
    44 42
     export OCAMLINIT_SED
    
    45 43
     
    
    46
    -.PHONY: override_dh_auto_install
    
    47 44
     override_dh_auto_install:
    
    48 45
     	$(MAKE) install prefix=$(CURDIR)/debian/tmp
    
    49 46
     # rm ocamlc.opt and similar settings, they're not avail everywhere in debian
    
    ... ... @@ -54,13 +51,19 @@ override_dh_auto_install:
    54 51
     	test -d $(CURDIR)/debian/tmp/usr/share/man/man3 && \
    
    55 52
     		rmdir $(CURDIR)/debian/tmp/usr/share/man/man3
    
    56 53
     
    
    54
    +execute_after_dh_install:
    
    55
    +# remove packages that are already provided by stdlib
    
    56
    +	for p in bytes; do \
    
    57
    +	  if [ -d $(OCAML_STDLIB_DIR)/$$p ]; then \
    
    58
    +	    rm -rf $(CURDIR)/debian/libfindlib-ocaml$(OCAML_STDLIB_DIR)/$$p; \
    
    59
    +	  fi; \
    
    60
    +	done
    
    61
    +
    
    57 62
     # do not strip executables on bytecode executables (is this still needed?)
    
    58 63
     ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
    
    59
    -.PHONY: override_dh_strip
    
    60 64
     override_dh_strip:
    
    61 65
     endif
    
    62 66
     
    
    63
    -.PHONY: override_dh_auto_clean
    
    64 67
     override_dh_auto_clean:
    
    65 68
     	if [ -f Makefile.config ]; then $(MAKE) clean; fi
    
    66 69
     	-rm -f Makefile.config ocargs.log src/findlib/ocaml_args.ml
    


  • Reply to: